github-linguist 5.3.3 → 6.0.0

data/grammars/text.html.php.json

@@ -1,140 +1,6 @@
 {
-  "comment": "TODO:\n• Try to improve parameters list syntax – scope numbers, ‘=’, ‘,’ and possibly be intelligent about entity ordering\n• Is meta.function-call the correct scope? I've added it to my theme but by default it's not highlighted",
-  "fileTypes": [
-    "php",
-    "php3",
-    "php4",
-    "php5",
-    "phpt",
-    "phtml",
-    "aw",
-    "ctp"
-  ],
-  "firstLineMatch": "^#!.*(?<!-)php[0-9]{0,1}\\b|<\\?php",
-  "foldingStartMarker": "(/\\*|\\{\\s*$|<<<HTML)",
-  "foldingStopMarker": "(\\*/|^\\s*\\}|^HTML;)",
-  "injections": {
-    "^text.html - (meta.embedded | meta.tag), L:^text.html meta.tag, L:text.html.php source.js": {
-      "patterns": [
-        {
-          "begin": "(^\\s*)(?=<\\?(?![^?]*\\?>))",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.whitespace.embedded.leading.php"
-            }
-          },
-          "end": "(?!\\G)(\\s*$\\n)?",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.whitespace.embedded.trailing.php"
-            }
-          },
-          "patterns": [
-            {
-              "begin": "<\\?(?i:php|=)?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                }
-              },
-              "contentName": "source.php",
-              "end": "(\\?)>",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "source.php"
-                }
-              },
-              "name": "meta.embedded.block.php",
-              "patterns": [
-                {
-                  "include": "#language"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "begin": "<\\?(?i:php|=)?(?![^?]*\\?>)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.begin.php"
-            }
-          },
-          "contentName": "source.php",
-          "end": "(\\?)>",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.end.php"
-            },
-            "1": {
-              "name": "source.php"
-            }
-          },
-          "name": "meta.embedded.block.php",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ]
-        },
-        {
-          "begin": "<\\?(?i:php|=)?",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.begin.php"
-            }
-          },
-          "end": ">",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.section.embedded.end.php"
-            }
-          },
-          "name": "meta.embedded.line.php",
-          "patterns": [
-            {
-              "captures": {
-                "1": {
-                  "name": "source.php"
-                },
-                "2": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "3": {
-                  "name": "source.php"
-                }
-              },
-              "match": "\\G(\\s*)((\\?))(?=>)",
-              "name": "meta.special.empty-tag.php"
-            },
-            {
-              "begin": "\\G",
-              "contentName": "source.php",
-              "end": "(\\?)(?=>)",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "source.php"
-                }
-              },
-              "patterns": [
-                {
-                  "include": "#language"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "keyEquivalent": "^~P",
   "name": "PHP",
+  "scopeName": "text.html.php",
   "patterns": [
     {
       "include": "text.html.basic"
@@ -144,13 +10,13 @@
     "class-builtin": {
       "patterns": [
         {
+          "name": "support.class.builtin.php",
+          "match": "(?i)(\\\\)?\\b(st(dClass|reamWrapper)|R(RD(Graph|Creator|Updater)|untimeException|e(sourceBundle|cursive(RegexIterator|Ca(chingIterator|llbackFilterIterator)|TreeIterator|Iterator(Iterator)?|DirectoryIterator|FilterIterator|ArrayIterator)|flect(ion(Generator|Method|Class|Type|ZendExtension|Object|P(arameter|roperty)|Extension|Function(Abstract)?)?|or)|gexIterator)|angeException)|G(ender\\\\Gender|lobIterator|magick(Draw|Pixel)?)|X(sltProcessor|ML(Reader|Diff\\\\(Memory|Base|DOM|File)|Writer)|SLTProcessor)|M(ysqlndUh(Connection|PreparedStatement)|ongo(Re(sultException|gex)|Grid(fsFile|FS(Cursor|File)?)|BinData|C(o(de|llection|mmandCursor)|ursor(Interface|Exception)?|lient)|Timestamp|I(n(sertBatch|t(32|64))|d)|D(B(Ref|\\\\(BSON\\\\(Regex|M(inKey|axKey)|Binary|Serializable|Timestamp|ObjectID|Decimal128|U(nserializable|TCDateTime)|Javascript)|Driver\\\\(Read(Concern|Preference)|Manager|BulkWrite|Server|C(ommand|ursor(Id)?)|Exception\\\\WriteException|Query|Write(Result|Concern(Error)?|Error))))?|eleteBatch|ate)|UpdateBatch|Pool|Write(Batch|ConcernException)|Log)?|u(tex|ltipleIterator)|e(ssageFormatter|mcache(d)?))|Bad(MethodCallException|FunctionCallException)|tidy(Node)?|S(ync(ReaderWriter|Mutex|S(haredMemory|emaphore)|Event)|impleXML(Iterator|Element)|oap(Server|Header|Client|Param|Var|Fault)|NMP|CA(_(SoapProxy|LocalProxy))?|p(hinxClient|oofchecker|l(M(inHeap|axHeap)|S(tack|ubject)|Heap|T(ype|empFileObject)|Ob(server|jectStorage)|DoublyLinkedList|PriorityQueue|Enum|Queue|Fi(le(Info|Object)|xedArray)))|e(ssionHandler(Interface)?|ekableIterator|rializable)|DO_(Model_(ReflectionDataObject|Type|Property)|Sequence|D(ata(Object|Factory)|AS_(Relational|XML(_Document)?|Setting|ChangeSummary|Data(Object|Factory)))|Exception|List)|wish(Result(s)?|Search)?|VM(Model)?|QLite(Result|3(Result|Stmt)?|Database|Unbuffered)|AM(Message|Connection))|H(RTime\\\\(StopWatch|PerformanceCounter)|aru(Image|Outline|D(oc|estination)|Page|Encoder|Font|Annotation))|Ya(f_(R(oute(_(Re(write|gex)|Map|S(tatic|imple|upervar)|Interface)|r)|e(sponse_Abstract|quest_(Simple|Http|Abstract)|gistry))|Session|Con(troller_Abstract|fig_(Simple|Ini|Abstract))|Dispatcher|Plugin_Abstract|Exception|View_(Simple|Interface)|Loader|A(ction_Abstract|pplication))|r_(Server(_Exception)?|C(oncurrent_Client|lient(_Exception)?)))|N(o(RewindIterator|rmalizer)|umberFormatter)|C(o(nd|untable|ll(ectable|ator))|URLFile|a(chingIterator|llbackFilterIterator))|T(hread(ed)?|okyoTyrant(Table|Iterator|Query)?|ra(nsliterator|versable))|I(n(tl(RuleBasedBreakIterator|BreakIterator|C(har|odePointBreakIterator|alendar)|TimeZone|Iterator|DateFormatter|PartsIterator)|validArgumentException|finiteIterator)|terator(Iterator|Aggregate)?|magick(Draw|Pixel(Iterator)?|Kernel)?)|php_user_filter|Z(MQ(Socket|Context|Device|Poll)?|ipArchive|ookeeper)|O(CI\\-(Collection|Lob)|ut(erIterator|Of(RangeException|BoundsException))|verflowException)|D(s\\\\(Map|S(tack|e(t|quence))|Hashable|Collection|Deque|P(air|riorityQueue)|Vector|Queue)|irectory(Iterator)?|omainException|OM(XPath|N(ode(list)?|amedNodeMap)|C(haracterData|omment|dataSection)|Text|Implementation|Document(Fragment)?|ProcessingInstruction|E(ntityReference|lement)|Attr)|ate(Time(I(nterface|mmutable)|Zone)?|Interval|Period))|U(n(derflowException|expectedValueException)|Converter|I\\\\(Menu(Item)?|Size|Control(s\\\\(Radio|Gr(id|oup)|MultilineEntry|B(ox|utton)|S(pin|eparator|lider)|C(heck|o(lorButton|mbo))|Tab|P(icker|rogress)|E(ntry|ditableCombo)|Form|Label))?|Draw\\\\(Matrix|Brush(\\\\(RadialGradient|Gradient|LinearGradient))?|Stroke|Color|Text\\\\(Font(\\\\Descriptor)?|Layout)|P(en|ath))|Point|Executor|Window|Area))|JsonSerializable|finfo|P(har(Data|FileInfo)?|ool|DO(Statement)?|arentIterator)|E(v(S(tat|ignal)|Ch(ild|eck)|Timer|I(o|dle)|ent(B(uffer(Event)?|ase)|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?|P(eriodic|repare)|Embed|Fork|Watcher|Loop)?|rrorException|xception|mptyIterator)|V(8Js(Exception)?|arnish(Stat|Log|Admin))|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|Frame|AttachedPictureFrame))|QuickHash(StringIntHash|Int(S(tringHash|et)|Hash))|F(il(terIterator|esystemIterator)|ANNConnection)|mysqli(_(stmt|driver|warning|result))?|W(orker|eak(Map|ref))|L(imitIterator|o(cale|gicException)|ua(Closure)?|engthException|apack)|A(ppendIterator|PC(Iterator|UIterator)|rray(Iterator|Object|Access)))\\b",
           "captures": {
             "1": {
               "name": "punctuation.separator.inheritance.php"
             }
-          },
-          "match": "(?i)(\\\\)?\\b(st(dClass|reamWrapper)|R(RD(Graph|Creator|Updater)|untimeException|e(sourceBundle|cursive(RegexIterator|Ca(chingIterator|llbackFilterIterator)|TreeIterator|Iterator(Iterator)?|DirectoryIterator|FilterIterator|ArrayIterator)|flect(ion(Generator|Method|Class|Type|ZendExtension|Object|P(arameter|roperty)|Extension|Function(Abstract)?)?|or)|gexIterator)|angeException)|G(ender\\\\Gender|lobIterator|magick(Draw|Pixel)?)|X(sltProcessor|ML(Reader|Diff\\\\(Memory|Base|DOM|File)|Writer)|SLTProcessor)|M(ysqlndUh(Connection|PreparedStatement)|ongo(Re(sultException|gex)|Grid(fsFile|FS(Cursor|File)?)|BinData|C(o(de|llection|mmandCursor)|ursor(Interface|Exception)?|lient)|Timestamp|I(n(sertBatch|t(32|64))|d)|D(B(Ref|\\\\(BSON\\\\(Regex|M(inKey|axKey)|Binary|Serializable|Timestamp|ObjectID|Decimal128|U(nserializable|TCDateTime)|Javascript)|Driver\\\\(Read(Concern|Preference)|Manager|BulkWrite|Server|C(ommand|ursor(Id)?)|Exception\\\\WriteException|Query|Write(Result|Concern(Error)?|Error))))?|eleteBatch|ate)|UpdateBatch|Pool|Write(Batch|ConcernException)|Log)?|u(tex|ltipleIterator)|e(ssageFormatter|mcache(d)?))|Bad(MethodCallException|FunctionCallException)|tidy(Node)?|S(ync(ReaderWriter|Mutex|S(haredMemory|emaphore)|Event)|impleXML(Iterator|Element)|oap(Server|Header|Client|Param|Var|Fault)|NMP|CA(_(SoapProxy|LocalProxy))?|p(hinxClient|oofchecker|l(M(inHeap|axHeap)|S(tack|ubject)|Heap|T(ype|empFileObject)|Ob(server|jectStorage)|DoublyLinkedList|PriorityQueue|Enum|Queue|Fi(le(Info|Object)|xedArray)))|e(ssionHandler(Interface)?|ekableIterator|rializable)|DO_(Model_(ReflectionDataObject|Type|Property)|Sequence|D(ata(Object|Factory)|AS_(Relational|XML(_Document)?|Setting|ChangeSummary|Data(Object|Factory)))|Exception|List)|wish(Result(s)?|Search)?|VM(Model)?|QLite(Result|3(Result|Stmt)?|Database|Unbuffered)|AM(Message|Connection))|H(RTime\\\\(StopWatch|PerformanceCounter)|aru(Image|Outline|D(oc|estination)|Page|Encoder|Font|Annotation))|Ya(f_(R(oute(_(Re(write|gex)|Map|S(tatic|imple|upervar)|Interface)|r)|e(sponse_Abstract|quest_(Simple|Http|Abstract)|gistry))|Session|Con(troller_Abstract|fig_(Simple|Ini|Abstract))|Dispatcher|Plugin_Abstract|Exception|View_(Simple|Interface)|Loader|A(ction_Abstract|pplication))|r_(Server(_Exception)?|C(oncurrent_Client|lient(_Exception)?)))|N(o(RewindIterator|rmalizer)|umberFormatter)|C(o(nd|untable|ll(ectable|ator))|URLFile|a(chingIterator|llbackFilterIterator))|T(hread(ed)?|okyoTyrant(Table|Iterator|Query)?|ra(nsliterator|versable))|I(n(tl(RuleBasedBreakIterator|BreakIterator|C(har|odePointBreakIterator|alendar)|TimeZone|Iterator|DateFormatter|PartsIterator)|validArgumentException|finiteIterator)|terator(Iterator|Aggregate)?|magick(Draw|Pixel(Iterator)?|Kernel)?)|php_user_filter|Z(MQ(Socket|Context|Device|Poll)?|ipArchive|ookeeper)|O(CI\\-(Collection|Lob)|ut(erIterator|Of(RangeException|BoundsException))|verflowException)|D(s\\\\(Map|S(tack|e(t|quence))|Hashable|Collection|Deque|P(air|riorityQueue)|Vector|Queue)|irectory(Iterator)?|omainException|OM(XPath|N(ode(list)?|amedNodeMap)|C(haracterData|omment|dataSection)|Text|Implementation|Document(Fragment)?|ProcessingInstruction|E(ntityReference|lement)|Attr)|ate(Time(I(nterface|mmutable)|Zone)?|Interval|Period))|U(n(derflowException|expectedValueException)|Converter|I\\\\(Menu(Item)?|Size|Control(s\\\\(Radio|Gr(id|oup)|MultilineEntry|B(ox|utton)|S(pin|eparator|lider)|C(heck|o(lorButton|mbo))|Tab|P(icker|rogress)|E(ntry|ditableCombo)|Form|Label))?|Draw\\\\(Matrix|Brush(\\\\(RadialGradient|Gradient|LinearGradient))?|Stroke|Color|Text\\\\(Font(\\\\Descriptor)?|Layout)|P(en|ath))|Point|Executor|Window|Area))|JsonSerializable|finfo|P(har(Data|FileInfo)?|ool|DO(Statement)?|arentIterator)|E(v(S(tat|ignal)|Ch(ild|eck)|Timer|I(o|dle)|ent(B(uffer(Event)?|ase)|SslContext|Http(Request|Connection)?|Config|DnsBase|Util|Listener)?|P(eriodic|repare)|Embed|Fork|Watcher|Loop)?|rrorException|xception|mptyIterator)|V(8Js(Exception)?|arnish(Stat|Log|Admin))|KTaglib_(MPEG_(File|AudioProperties)|Tag|ID3v2_(Tag|Frame|AttachedPictureFrame))|QuickHash(StringIntHash|Int(S(tringHash|et)|Hash))|F(il(terIterator|esystemIterator)|ANNConnection)|mysqli(_(stmt|driver|warning|result))?|W(orker|eak(Map|ref))|L(imitIterator|o(cale|gicException)|ua(Closure)?|engthException|apack)|A(ppendIterator|PC(Iterator|UIterator)|rray(Iterator|Object|Access)))\\b",
-          "name": "support.class.builtin.php"
+          }
         }
       ]
     },
@@ -159,16 +25,16 @@
         {
           "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
           "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
-          "endCaptures": {
-            "1": {
-              "name": "support.class.php"
-            }
-          },
           "patterns": [
             {
               "include": "#namespace"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "support.class.php"
+            }
+          }
         },
         {
           "include": "#class-builtin"
@@ -176,88 +42,87 @@
         {
           "begin": "(?=[\\\\a-zA-Z_])",
           "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
-          "endCaptures": {
-            "1": {
-              "name": "support.class.php"
-            }
-          },
           "patterns": [
             {
               "include": "#namespace"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "support.class.php"
+            }
+          }
         }
       ]
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.documentation.phpdoc.php",
           "begin": "/\\*\\*(?:#@\\+)?\\s*$",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.php"
-            }
-          },
-          "comment": "This now only highlights a docblock if the first line contains only /**\n\t\t\t\t\t\t\t\t- this is to stop highlighting everything as invalid when people do comment banners with /******** ...\n\t\t\t\t\t\t\t\t- Now matches /**#@+ too - used for docblock templates: http://manual.phpdoc.org/HTMLframesConverter/default/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.docblocktemplate",
           "end": "\\*/",
-          "name": "comment.block.documentation.phpdoc.php",
           "patterns": [
             {
               "include": "#php_doc"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.php"
+            }
+          }
         },
         {
+          "name": "comment.block.php",
           "begin": "/\\*",
+          "end": "\\*/",
           "captures": {
             "0": {
               "name": "punctuation.definition.comment.php"
             }
-          },
-          "end": "\\*/",
-          "name": "comment.block.php"
+          }
         },
         {
           "begin": "(^[ \\t]+)?(?=//)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.whitespace.comment.leading.php"
-            }
-          },
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.double-slash.php",
               "begin": "//",
+              "end": "\\n|(?=\\?\u003e)",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.php"
                 }
-              },
-              "end": "\\n|(?=\\?>)",
-              "name": "comment.line.double-slash.php"
+              }
             }
-          ]
-        },
-        {
-          "begin": "(^[ \\t]+)?(?=#)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.whitespace.comment.leading.php"
             }
-          },
+          }
+        },
+        {
+          "begin": "(^[ \\t]+)?(?=#)",
           "end": "(?!\\G)",
           "patterns": [
             {
+              "name": "comment.line.number-sign.php",
               "begin": "#",
+              "end": "\\n|(?=\\?\u003e)",
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.definition.comment.php"
                 }
-              },
-              "end": "\\n|(?=\\?>)",
-              "name": "comment.line.number-sign.php"
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.whitespace.comment.leading.php"
+            }
+          }
         }
       ]
     },
@@ -266,65 +131,64 @@
         {
           "begin": "(?xi)(?=\n\t\t\t            (\n\t\t\t                (\\\\[a-z_][a-z_0-9]*\\\\[a-z_][a-z_0-9\\\\]*)|\n\t\t\t                ([a-z_][a-z_0-9]*\\\\[a-z_][a-z_0-9\\\\]*)\n\t\t\t            )\n\t\t\t            [^a-z_0-9\\\\])",
           "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
-          "endCaptures": {
-            "1": {
-              "name": "constant.other.php"
-            }
-          },
           "patterns": [
             {
               "include": "#namespace"
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "constant.other.php"
+            }
+          }
         },
         {
           "begin": "(?=\\\\?[a-zA-Z_\\x{7f}-\\x{ff}])",
           "end": "(?=[^\\\\a-zA-Z_\\x{7f}-\\x{ff}])",
           "patterns": [
             {
-              "match": "(?i)\\b(TRUE|FALSE|NULL|__(FILE|DIR|FUNCTION|CLASS|METHOD|LINE|NAMESPACE)__|ON|OFF|YES|NO|NL|BR|TAB)\\b",
-              "name": "constant.language.php"
+              "name": "constant.language.php",
+              "match": "(?i)\\b(TRUE|FALSE|NULL|__(FILE|DIR|FUNCTION|CLASS|METHOD|LINE|NAMESPACE)__|ON|OFF|YES|NO|NL|BR|TAB)\\b"
             },
             {
+              "name": "support.constant.core.php",
+              "match": "(\\\\)?\\b(STD(IN|OUT|ERR)|ZEND_(THREAD_SAFE|DEBUG_BUILD)|DEFAULT_INCLUDE_PATH|P(HP_(R(OUND_HALF_(ODD|DOWN|UP|EVEN)|ELEASE_VERSION)|M(INOR_VERSION|A(XPATHLEN|JOR_VERSION))|BINDIR|S(HLIB_SUFFIX|YSCONFDIR|API)|CONFIG_FILE_(SCAN_DIR|PATH)|INT_(MAX|SIZE)|ZTS|O(S|UTPUT_HANDLER_(START|CONT|END))|D(EBUG|ATADIR)|URL_(SCHEME|HOST|USER|P(ORT|A(SS|TH))|QUERY|FRAGMENT)|PREFIX|E(XT(RA_VERSION|ENSION_DIR)|OL)|VERSION(_ID)?|WINDOWS_(NT_(SERVER|DOMAIN_CONTROLLER|WORKSTATION)|VERSION_(M(INOR|AJOR)|BUILD|S(UITEMASK|P_M(INOR|AJOR))|P(RODUCTTYPE|LATFORM)))|L(IBDIR|OCALSTATEDIR))|EAR_(INSTALL_DIR|EXTENSION_DIR))|E_(RECOVERABLE_ERROR|STRICT|NOTICE|CO(RE_(ERROR|WARNING)|MPILE_(ERROR|WARNING))|DEPRECATED|USER_(NOTICE|DEPRECATED|ERROR|WARNING)|PARSE|ERROR|WARNING|ALL))\\b",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.inheritance.php"
                 }
-              },
-              "match": "(\\\\)?\\b(STD(IN|OUT|ERR)|ZEND_(THREAD_SAFE|DEBUG_BUILD)|DEFAULT_INCLUDE_PATH|P(HP_(R(OUND_HALF_(ODD|DOWN|UP|EVEN)|ELEASE_VERSION)|M(INOR_VERSION|A(XPATHLEN|JOR_VERSION))|BINDIR|S(HLIB_SUFFIX|YSCONFDIR|API)|CONFIG_FILE_(SCAN_DIR|PATH)|INT_(MAX|SIZE)|ZTS|O(S|UTPUT_HANDLER_(START|CONT|END))|D(EBUG|ATADIR)|URL_(SCHEME|HOST|USER|P(ORT|A(SS|TH))|QUERY|FRAGMENT)|PREFIX|E(XT(RA_VERSION|ENSION_DIR)|OL)|VERSION(_ID)?|WINDOWS_(NT_(SERVER|DOMAIN_CONTROLLER|WORKSTATION)|VERSION_(M(INOR|AJOR)|BUILD|S(UITEMASK|P_M(INOR|AJOR))|P(RODUCTTYPE|LATFORM)))|L(IBDIR|OCALSTATEDIR))|EAR_(INSTALL_DIR|EXTENSION_DIR))|E_(RECOVERABLE_ERROR|STRICT|NOTICE|CO(RE_(ERROR|WARNING)|MPILE_(ERROR|WARNING))|DEPRECATED|USER_(NOTICE|DEPRECATED|ERROR|WARNING)|PARSE|ERROR|WARNING|ALL))\\b",
-              "name": "support.constant.core.php"
+              }
             },
             {
+              "name": "support.constant.std.php",
+              "match": "(\\\\)?\\b(RADIXCHAR|GROUPING|M(_(1_PI|SQRT(1_2|2|3|PI)|2_(SQRTPI|PI)|PI(_(2|4))?|E(ULER)?|L(N(10|2|PI)|OG(10E|2E)))|ON_(GROUPING|1(1|2|0)?|7|2|8|THOUSANDS_SEP|3|DECIMAL_POINT|9|4|5|6))|S(TR_PAD_(RIGHT|BOTH|LEFT)|ORT_(REGULAR|STRING|NUMERIC|DESC|LOCALE_STRING|ASC)|EEK_(SET|CUR|END))|H(TML_(SPECIALCHARS|ENTITIES)|ASH_HMAC)|YES(STR|EXPR)|N(_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|O(STR|EXPR)|EGATIVE_SIGN|AN)|C(R(YPT_(MD5|BLOWFISH|S(HA(256|512)|TD_DES|ALT_LENGTH)|EXT_DES)|NCYSTR|EDITS_(G(ROUP|ENERAL)|MODULES|SAPI|DOCS|QA|FULLPAGE|ALL))|HAR_MAX|O(NNECTION_(NORMAL|TIMEOUT|ABORTED)|DESET|UNT_(RECURSIVE|NORMAL))|URRENCY_SYMBOL|ASE_(UPPER|LOWER))|__COMPILER_HALT_OFFSET__|T(HOUS(EP|ANDS_SEP)|_FMT(_AMPM)?)|IN(T_(CURR_SYMBOL|FRAC_DIGITS)|I_(S(YSTEM|CANNER_(RAW|NORMAL))|USER|PERDIR|ALL)|F(O_(GENERAL|MODULES|C(REDITS|ONFIGURATION)|ENVIRONMENT|VARIABLES|LICENSE|ALL))?)|D(_(T_FMT|FMT)|IRECTORY_SEPARATOR|ECIMAL_POINT|A(Y_(1|7|2|3|4|5|6)|TE_(R(SS|FC(1(123|036)|2822|8(22|50)|3339))|COOKIE|ISO8601|W3C|ATOM)))|UPLOAD_ERR_(NO_(TMP_DIR|FILE)|CANT_WRITE|INI_SIZE|OK|PARTIAL|EXTENSION|FORM_SIZE)|P(M_STR|_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|OSITIVE_SIGN|ATH(_SEPARATOR|INFO_(BASENAME|DIRNAME|EXTENSION|FILENAME)))|E(RA(_(YEAR|T_FMT|D_(T_FMT|FMT)))?|XTR_(REFS|SKIP|IF_EXISTS|OVERWRITE|PREFIX_(SAME|I(NVALID|F_EXISTS)|ALL))|NT_(NOQUOTES|COMPAT|IGNORE|QUOTES))|FRAC_DIGITS|L(C_(M(ONETARY|ESSAGES)|NUMERIC|C(TYPE|OLLATE)|TIME|ALL)|O(G_(MAIL|SYSLOG|N(O(TICE|WAIT)|DELAY|EWS)|C(R(IT|ON)|ONS)|INFO|ODELAY|D(EBUG|AEMON)|U(SER|UCP)|P(ID|ERROR)|E(RR|MERG)|KERN|WARNING|L(OCAL(1|7|2|3|4|5|0|6)|PR)|A(UTH(PRIV)?|LERT))|CK_(SH|NB|UN|EX)))|A(M_STR|B(MON_(1(1|2|0)?|7|2|8|3|9|4|5|6)|DAY_(1|7|2|3|4|5|6))|SSERT_(BAIL|CALLBACK|QUIET_EVAL|WARNING|ACTIVE)|LT_DIGITS))\\b",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.inheritance.php"
                 }
-              },
-              "match": "(\\\\)?\\b(RADIXCHAR|GROUPING|M(_(1_PI|SQRT(1_2|2|3|PI)|2_(SQRTPI|PI)|PI(_(2|4))?|E(ULER)?|L(N(10|2|PI)|OG(10E|2E)))|ON_(GROUPING|1(1|2|0)?|7|2|8|THOUSANDS_SEP|3|DECIMAL_POINT|9|4|5|6))|S(TR_PAD_(RIGHT|BOTH|LEFT)|ORT_(REGULAR|STRING|NUMERIC|DESC|LOCALE_STRING|ASC)|EEK_(SET|CUR|END))|H(TML_(SPECIALCHARS|ENTITIES)|ASH_HMAC)|YES(STR|EXPR)|N(_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|O(STR|EXPR)|EGATIVE_SIGN|AN)|C(R(YPT_(MD5|BLOWFISH|S(HA(256|512)|TD_DES|ALT_LENGTH)|EXT_DES)|NCYSTR|EDITS_(G(ROUP|ENERAL)|MODULES|SAPI|DOCS|QA|FULLPAGE|ALL))|HAR_MAX|O(NNECTION_(NORMAL|TIMEOUT|ABORTED)|DESET|UNT_(RECURSIVE|NORMAL))|URRENCY_SYMBOL|ASE_(UPPER|LOWER))|__COMPILER_HALT_OFFSET__|T(HOUS(EP|ANDS_SEP)|_FMT(_AMPM)?)|IN(T_(CURR_SYMBOL|FRAC_DIGITS)|I_(S(YSTEM|CANNER_(RAW|NORMAL))|USER|PERDIR|ALL)|F(O_(GENERAL|MODULES|C(REDITS|ONFIGURATION)|ENVIRONMENT|VARIABLES|LICENSE|ALL))?)|D(_(T_FMT|FMT)|IRECTORY_SEPARATOR|ECIMAL_POINT|A(Y_(1|7|2|3|4|5|6)|TE_(R(SS|FC(1(123|036)|2822|8(22|50)|3339))|COOKIE|ISO8601|W3C|ATOM)))|UPLOAD_ERR_(NO_(TMP_DIR|FILE)|CANT_WRITE|INI_SIZE|OK|PARTIAL|EXTENSION|FORM_SIZE)|P(M_STR|_(S(IGN_POSN|EP_BY_SPACE)|CS_PRECEDES)|OSITIVE_SIGN|ATH(_SEPARATOR|INFO_(BASENAME|DIRNAME|EXTENSION|FILENAME)))|E(RA(_(YEAR|T_FMT|D_(T_FMT|FMT)))?|XTR_(REFS|SKIP|IF_EXISTS|OVERWRITE|PREFIX_(SAME|I(NVALID|F_EXISTS)|ALL))|NT_(NOQUOTES|COMPAT|IGNORE|QUOTES))|FRAC_DIGITS|L(C_(M(ONETARY|ESSAGES)|NUMERIC|C(TYPE|OLLATE)|TIME|ALL)|O(G_(MAIL|SYSLOG|N(O(TICE|WAIT)|DELAY|EWS)|C(R(IT|ON)|ONS)|INFO|ODELAY|D(EBUG|AEMON)|U(SER|UCP)|P(ID|ERROR)|E(RR|MERG)|KERN|WARNING|L(OCAL(1|7|2|3|4|5|0|6)|PR)|A(UTH(PRIV)?|LERT))|CK_(SH|NB|UN|EX)))|A(M_STR|B(MON_(1(1|2|0)?|7|2|8|3|9|4|5|6)|DAY_(1|7|2|3|4|5|6))|SSERT_(BAIL|CALLBACK|QUIET_EVAL|WARNING|ACTIVE)|LT_DIGITS))\\b",
-              "name": "support.constant.std.php"
+              }
             },
             {
+              "name": "support.constant.ext.php",
+              "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|HTML_DOCUMENT_NODE|N(OTATION_NODE|AMESPACE_DECL_NODE)|C(OMMENT_NODE|DATA_SECTION_NODE)|TEXT_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|D(TD_NODE|OCUMENT_(NODE|TYPE_NODE|FRAG_NODE))|PI_NODE|E(RROR_(RECURSIVE_ENTITY_REF|MISPLACED_XML_PI|B(INARY_ENTITY_REF|AD_CHAR_REF)|SYNTAX|NO(NE|_(MEMORY|ELEMENTS))|TAG_MISMATCH|IN(CORRECT_ENCODING|VALID_TOKEN)|DUPLICATE_ATTRIBUTE|UN(CLOSED_(CDATA_SECTION|TOKEN)|DEFINED_ENTITY|KNOWN_ENCODING)|JUNK_AFTER_DOC_ELEMENT|PAR(TIAL_CHAR|AM_ENTITY_REF)|EXTERNAL_ENTITY_HANDLING|A(SYNC_ENTITY|TTRIBUTE_EXTERNAL_ENTITY_REF))|NTITY_(REF_NODE|NODE|DECL_NODE)|LEMENT_(NODE|DECL_NODE))|LOCAL_NAMESPACE|ATTRIBUTE_(N(MTOKEN(S)?|O(TATION|DE))|CDATA|ID(REF(S)?)?|DECL_NODE|EN(TITY|UMERATION)))|M(HASH_(RIPEMD(1(28|60)|256|320)|GOST|MD(2|4|5)|S(HA(1|2(24|56)|384|512)|NEFRU256)|HAVAL(1(28|92|60)|2(24|56))|CRC32(B)?|TIGER(1(28|60))?|WHIRLPOOL|ADLER32)|YSQL(_(BOTH|NUM|CLIENT_(SSL|COMPRESS|I(GNORE_SPACE|NTERACTIVE))|ASSOC)|I_(RE(PORT_(STRICT|INDEX|OFF|ERROR|ALL)|FRESH_(GRANT|MASTER|BACKUP_LOG|S(TATUS|LAVE)|HOSTS|T(HREADS|ABLES)|LOG)|AD_DEFAULT_(GROUP|FILE))|GROUP_FLAG|MULTIPLE_KEY_FLAG|B(INARY_FLAG|OTH|LOB_FLAG)|S(T(MT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|ORE_RESULT)|E(RVER_QUERY_(NO_(GOOD_INDEX_USED|INDEX_USED)|WAS_SLOW)|T_(CHARSET_NAME|FLAG)))|N(O(_D(EFAULT_VALUE_FLAG|ATA)|T_NULL_FLAG)|UM(_FLAG)?)|C(URSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|LIENT_(SSL|NO_SCHEMA|COMPRESS|I(GNORE_SPACE|NTERACTIVE)|FOUND_ROWS))|T(YPE_(GEOMETRY|MEDIUM_BLOB|B(IT|LOB)|S(HORT|TRING|ET)|YEAR|N(ULL|EWD(ECIMAL|ATE))|CHAR|TI(ME(STAMP)?|NY(_BLOB)?)|INT(24|ERVAL)|D(OUBLE|ECIMAL|ATE(TIME)?)|ENUM|VAR_STRING|FLOAT|LONG(_BLOB|LONG)?)|IMESTAMP_FLAG)|INIT_COMMAND|ZEROFILL_FLAG|O(N_UPDATE_NOW_FLAG|PT_(NET_(READ_BUFFER_SIZE|CMD_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE))|D(EBUG_TRACE_ENABLED|ATA_TRUNCATED)|U(SE_RESULT|N(SIGNED_FLAG|IQUE_KEY_FLAG))|P(RI_KEY_FLAG|ART_KEY_FLAG)|ENUM_FLAG|A(S(SOC|YNC)|UTO_INCREMENT_FLAG)))|CRYPT_(R(C(2|6)|IJNDAEL_(1(28|92)|256)|AND)|GOST|XTEA|M(ODE_(STREAM|NOFB|C(BC|FB)|OFB|ECB)|ARS)|BLOWFISH(_COMPAT)?|S(ERPENT|KIPJACK|AFER(128|PLUS|64))|C(RYPT|AST_(128|256))|T(RIPLEDES|HREEWAY|WOFISH)|IDEA|3DES|DE(S|CRYPT|V_(RANDOM|URANDOM))|PANAMA|EN(CRYPT|IGNA)|WAKE|LOKI97|ARCFOUR(_IV)?))|S(TREAM_(REPORT_ERRORS|M(UST_SEEK|KDIR_RECURSIVE)|BUFFER_(NONE|FULL|LINE)|S(HUT_(RD(WR)?|WR)|OCK_(R(DM|AW)|S(TREAM|EQPACKET)|DGRAM)|ERVER_(BIND|LISTEN))|NOTIFY_(RE(SOLVE|DIRECTED)|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|CO(MPLETED|NNECT)|PROGRESS|F(ILE_SIZE_IS|AILURE)|AUTH_RE(SULT|QUIRED))|C(RYPTO_METHOD_(SSLv(2(_(SERVER|CLIENT)|3_(SERVER|CLIENT))|3_(SERVER|CLIENT))|TLS_(SERVER|CLIENT))|LIENT_(CONNECT|PERSISTENT|ASYNC_CONNECT)|AST_(FOR_SELECT|AS_STREAM))|I(GNORE_URL|S_URL|PPROTO_(RAW|TCP|I(CMP|P)|UDP))|O(OB|PTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER))|U(RL_STAT_(QUIET|LINK)|SE_PATH)|P(EEK|F_(INET(6)?|UNIX))|ENFORCE_SAFE_MODE|FILTER_(READ|WRITE|ALL))|UNFUNCS_RET_(STRING|TIMESTAMP|DOUBLE)|QLITE(_(R(OW|EADONLY)|MIS(MATCH|USE)|B(OTH|USY)|SCHEMA|N(O(MEM|T(FOUND|ADB)|LFS)|UM)|C(O(RRUPT|NSTRAINT)|ANTOPEN)|TOOBIG|I(NTER(RUPT|NAL)|OERR)|OK|DONE|P(ROTOCOL|ERM)|E(RROR|MPTY)|F(ORMAT|ULL)|LOCKED|A(BORT|SSOC|UTH))|3_(B(OTH|LOB)|NU(M|LL)|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT|ASSOC)))|CURL(M(SG_DONE|_(BAD_(HANDLE|EASY_HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|O(UT_OF_MEMORY|K)))|SSH_AUTH_(HOST|NONE|DEFAULT|P(UBLICKEY|ASSWORD)|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC))|_(HTTP_VERSION_(1_(1|0)|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(MODSINCE|UNMODSINCE)|LASTMOD)|IPRESOLVE_(V(4|6)|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|INFO_(RE(DIRECT_(COUNT|TIME)|QUEST_SIZE)|S(SL_VERIFYRESULT|TARTTRANSFER_TIME|IZE_(DOWNLOAD|UPLOAD)|PEED_(DOWNLOAD|UPLOAD))|H(TTP_CODE|EADER_(SIZE|OUT))|NAMELOOKUP_TIME|C(ON(NECT_TIME|TENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD)))|ERTINFO)|TOTAL_TIME|PR(IVATE|ETRANSFER_TIME)|EFFECTIVE_URL|FILETIME)|OPT_(R(E(SUME_FROM|TURNTRANSFER|DIR_PROTOCOLS|FERER|AD(DATA|FUNCTION))|AN(GE|DOM_FILE))|MAX(REDIRS|CONNECTS)|B(INARYTRANSFER|UFFERSIZE)|S(S(H_(HOST_PUBLIC_KEY_MD5|P(RIVATE_KEYFILE|UBLIC_KEYFILE)|AUTH_TYPES)|L(CERT(TYPE|PASSWD)?|_(CIPHER_LIST|VERIFY(HOST|PEER))|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?))|TDERR)|H(TTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|EADER(FUNCTION)?)|N(O(BODY|SIGNAL|PROGRESS)|ETRC)|C(RLF|O(NNECTTIMEOUT(_MS)?|OKIE(SESSION|JAR|FILE)?)|USTOMREQUEST|ERTINFO|LOSEPOLICY|A(INFO|PATH))|T(RANSFERTEXT|CP_NODELAY|IME(CONDITION|OUT(_MS)?|VALUE))|I(N(TERFACE|FILE(SIZE)?)|PRESOLVE)|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|U(RL|SER(PWD|AGENT)|NRESTRICTED_AUTH|PLOAD)|P(R(IVATE|O(GRESSFUNCTION|XY(TYPE|USERPWD|PORT|AUTH)?|TOCOLS))|O(RT|ST(REDIR|QUOTE|FIELDS)?)|UT)|E(GDSOCKET|NCODING)|VERBOSE|K(RB4LEVEL|EYPASSWD)|QUOTE|F(RESH_CONNECT|TP(SSLAUTH|_(S(SL|KIP_PASV_IP)|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|PORT|LISTONLY|APPEND)|ILE(TIME)?|O(RBID_REUSE|LLOWLOCATION)|AILONERROR)|WRITE(HEADER|FUNCTION)|LOW_SPEED_(TIME|LIMIT)|AUTOREFERER)|PRO(XY_(SOCKS(4|5)|HTTP)|TO_(S(CP|FTP)|HTTP(S)?|T(ELNET|FTP)|DICT|F(TP(S)?|ILE)|LDAP(S)?|ALL))|E_(RE(CV_ERROR|AD_ERROR)|GOT_NOTHING|MALFORMAT_USER|BAD_(C(ONTENT_ENCODING|ALLING_ORDER)|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|S(S(H|L_(C(IPHER|ONNECT_ERROR|ERTPROBLEM|ACERT)|PEER_CERTIFICATE|ENGINE_(SETFAILED|NOTFOUND)))|HARE_IN_USE|END_ERROR)|HTTP_(RANGE_ERROR|NOT_FOUND|PO(RT_FAILED|ST_ERROR))|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|T(OO_MANY_REDIRECTS|ELNET_OPTION_SYNTAX)|O(BSOLETE|UT_OF_MEMORY|PERATION_TIMEOUTED|K)|U(RL_MALFORMAT(_USER)?|N(SUPPORTED_PROTOCOL|KNOWN_TELNET_OPTION))|PARTIAL_FILE|F(TP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|C(OULDNT_(RETR_FILE|GET_SIZE|S(TOR_FILE|ET_(BINARY|ASCII))|USE_REST)|ANT_(RECONNECT|GET_HOST))|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|W(RITE_ERROR|EIRD_(SERVER_REPLY|227_FORMAT|USER_REPLY|PAS(S_REPLY|V_REPLY)))|ACCESS_DENIED)|ILE(SIZE_EXCEEDED|_COULDNT_READ_FILE)|UNCTION_NOT_FOUND|AILED_INIT)|WRITE_ERROR|L(IBRARY_NOT_FOUND|DAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL))|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTICWD|SINGLECWD|NOCWD)|SSL_(NONE|CONTROL|TRY|ALL)|AUTH_(SSL|TLS|DEFAULT))|AUTH_(GSSNEGOTIATE|BASIC|NTLM|DIGEST|ANY(SAFE)?))|I(MAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|I(CO|FF)|UNKNOWN|J(B2|P(X|2|C|EG(2000)?))|P(SD|NG)|WBMP)|NPUT_(REQUEST|GET|SE(RVER|SSION)|COOKIE|POST|ENV)|CONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION))|D(NS_(MX|S(RV|OA)|HINFO|N(S|APTR)|CNAME|TXT|PTR|A(NY|LL|AAA|6)?)|OM(STRING_SIZE_ERR|_(SYNTAX_ERR|HIERARCHY_REQUEST_ERR|N(O(_(MODIFICATION_ALLOWED_ERR|DATA_ALLOWED_ERR)|T_(SUPPORTED_ERR|FOUND_ERR))|AMESPACE_ERR)|IN(DEX_SIZE_ERR|USE_ATTRIBUTE_ERR|VALID_(MODIFICATION_ERR|STATE_ERR|CHARACTER_ERR|ACCESS_ERR))|PHP_ERR|VALIDATION_ERR|WRONG_DOCUMENT_ERR)))|JSON_(HEX_(TAG|QUOT|A(MP|POS))|NUMERIC_CHECK|ERROR_(S(YNTAX|TATE_MISMATCH)|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|P(REG_(RECURSION_LIMIT_ERROR|GREP_INVERT|BA(CKTRACK_LIMIT_ERROR|D_UTF8_(OFFSET_ERROR|ERROR))|S(PLIT_(NO_EMPTY|OFFSET_CAPTURE|DELIM_CAPTURE)|ET_ORDER)|NO_ERROR|INTERNAL_ERROR|OFFSET_CAPTURE|PATTERN_ORDER)|SFS_(PASS_ON|ERR_FATAL|F(EED_ME|LAG_(NORMAL|FLUSH_(CLOSE|INC))))|CRE_VERSION|OSIX_(R_OK|X_OK|S_IF(REG|BLK|SOCK|CHR|IFO)|F_OK|W_OK))|F(NM_(NOESCAPE|CASEFOLD|P(ERIOD|ATHNAME))|IL(TER_(REQUIRE_(SCALAR|ARRAY)|SANITIZE_(MAGIC_QUOTES|S(TRI(NG|PPED)|PECIAL_CHARS)|NUMBER_(INT|FLOAT)|URL|E(MAIL|NCODED)|FULL_SPECIAL_CHARS)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|VALIDATE_(REGEXP|BOOLEAN|I(NT|P)|URL|EMAIL|FLOAT)|F(ORCE_ARRAY|LAG_(S(CHEME_REQUIRED|TRIP_(BACKTICK|HIGH|LOW))|HOST_REQUIRED|NO(NE|_(RES_RANGE|PRIV_RANGE|ENCODE_QUOTES))|IPV(4|6)|PATH_REQUIRED|E(MPTY_STRING_NULL|NCODE_(HIGH|LOW|AMP))|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION))))|E(_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|INFO_(RAW|MIME(_(TYPE|ENCODING))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)))|ORCE_(GZIP|DEFLATE))|LIBXML_(XINCLUDE|N(SCLEAN|O(XMLDECL|BLANKS|NET|CDATA|E(RROR|MPTYTAG|NT)|WARNING))|COMPACT|D(TD(VALID|LOAD|ATTR)|OTTED_VERSION)|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)|VERSION|LOADED_VERSION))\\b",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.inheritance.php"
                 }
-              },
-              "match": "(\\\\)?\\b(GLOB_(MARK|BRACE|NO(SORT|CHECK|ESCAPE)|ONLYDIR|ERR|AVAILABLE_FLAGS)|XML_(SAX_IMPL|HTML_DOCUMENT_NODE|N(OTATION_NODE|AMESPACE_DECL_NODE)|C(OMMENT_NODE|DATA_SECTION_NODE)|TEXT_NODE|OPTION_(SKIP_(TAGSTART|WHITE)|CASE_FOLDING|TARGET_ENCODING)|D(TD_NODE|OCUMENT_(NODE|TYPE_NODE|FRAG_NODE))|PI_NODE|E(RROR_(RECURSIVE_ENTITY_REF|MISPLACED_XML_PI|B(INARY_ENTITY_REF|AD_CHAR_REF)|SYNTAX|NO(NE|_(MEMORY|ELEMENTS))|TAG_MISMATCH|IN(CORRECT_ENCODING|VALID_TOKEN)|DUPLICATE_ATTRIBUTE|UN(CLOSED_(CDATA_SECTION|TOKEN)|DEFINED_ENTITY|KNOWN_ENCODING)|JUNK_AFTER_DOC_ELEMENT|PAR(TIAL_CHAR|AM_ENTITY_REF)|EXTERNAL_ENTITY_HANDLING|A(SYNC_ENTITY|TTRIBUTE_EXTERNAL_ENTITY_REF))|NTITY_(REF_NODE|NODE|DECL_NODE)|LEMENT_(NODE|DECL_NODE))|LOCAL_NAMESPACE|ATTRIBUTE_(N(MTOKEN(S)?|O(TATION|DE))|CDATA|ID(REF(S)?)?|DECL_NODE|EN(TITY|UMERATION)))|M(HASH_(RIPEMD(1(28|60)|256|320)|GOST|MD(2|4|5)|S(HA(1|2(24|56)|384|512)|NEFRU256)|HAVAL(1(28|92|60)|2(24|56))|CRC32(B)?|TIGER(1(28|60))?|WHIRLPOOL|ADLER32)|YSQL(_(BOTH|NUM|CLIENT_(SSL|COMPRESS|I(GNORE_SPACE|NTERACTIVE))|ASSOC)|I_(RE(PORT_(STRICT|INDEX|OFF|ERROR|ALL)|FRESH_(GRANT|MASTER|BACKUP_LOG|S(TATUS|LAVE)|HOSTS|T(HREADS|ABLES)|LOG)|AD_DEFAULT_(GROUP|FILE))|GROUP_FLAG|MULTIPLE_KEY_FLAG|B(INARY_FLAG|OTH|LOB_FLAG)|S(T(MT_ATTR_(CURSOR_TYPE|UPDATE_MAX_LENGTH|PREFETCH_ROWS)|ORE_RESULT)|E(RVER_QUERY_(NO_(GOOD_INDEX_USED|INDEX_USED)|WAS_SLOW)|T_(CHARSET_NAME|FLAG)))|N(O(_D(EFAULT_VALUE_FLAG|ATA)|T_NULL_FLAG)|UM(_FLAG)?)|C(URSOR_TYPE_(READ_ONLY|SCROLLABLE|NO_CURSOR|FOR_UPDATE)|LIENT_(SSL|NO_SCHEMA|COMPRESS|I(GNORE_SPACE|NTERACTIVE)|FOUND_ROWS))|T(YPE_(GEOMETRY|MEDIUM_BLOB|B(IT|LOB)|S(HORT|TRING|ET)|YEAR|N(ULL|EWD(ECIMAL|ATE))|CHAR|TI(ME(STAMP)?|NY(_BLOB)?)|INT(24|ERVAL)|D(OUBLE|ECIMAL|ATE(TIME)?)|ENUM|VAR_STRING|FLOAT|LONG(_BLOB|LONG)?)|IMESTAMP_FLAG)|INIT_COMMAND|ZEROFILL_FLAG|O(N_UPDATE_NOW_FLAG|PT_(NET_(READ_BUFFER_SIZE|CMD_BUFFER_SIZE)|CONNECT_TIMEOUT|INT_AND_FLOAT_NATIVE|LOCAL_INFILE))|D(EBUG_TRACE_ENABLED|ATA_TRUNCATED)|U(SE_RESULT|N(SIGNED_FLAG|IQUE_KEY_FLAG))|P(RI_KEY_FLAG|ART_KEY_FLAG)|ENUM_FLAG|A(S(SOC|YNC)|UTO_INCREMENT_FLAG)))|CRYPT_(R(C(2|6)|IJNDAEL_(1(28|92)|256)|AND)|GOST|XTEA|M(ODE_(STREAM|NOFB|C(BC|FB)|OFB|ECB)|ARS)|BLOWFISH(_COMPAT)?|S(ERPENT|KIPJACK|AFER(128|PLUS|64))|C(RYPT|AST_(128|256))|T(RIPLEDES|HREEWAY|WOFISH)|IDEA|3DES|DE(S|CRYPT|V_(RANDOM|URANDOM))|PANAMA|EN(CRYPT|IGNA)|WAKE|LOKI97|ARCFOUR(_IV)?))|S(TREAM_(REPORT_ERRORS|M(UST_SEEK|KDIR_RECURSIVE)|BUFFER_(NONE|FULL|LINE)|S(HUT_(RD(WR)?|WR)|OCK_(R(DM|AW)|S(TREAM|EQPACKET)|DGRAM)|ERVER_(BIND|LISTEN))|NOTIFY_(RE(SOLVE|DIRECTED)|MIME_TYPE_IS|SEVERITY_(INFO|ERR|WARN)|CO(MPLETED|NNECT)|PROGRESS|F(ILE_SIZE_IS|AILURE)|AUTH_RE(SULT|QUIRED))|C(RYPTO_METHOD_(SSLv(2(_(SERVER|CLIENT)|3_(SERVER|CLIENT))|3_(SERVER|CLIENT))|TLS_(SERVER|CLIENT))|LIENT_(CONNECT|PERSISTENT|ASYNC_CONNECT)|AST_(FOR_SELECT|AS_STREAM))|I(GNORE_URL|S_URL|PPROTO_(RAW|TCP|I(CMP|P)|UDP))|O(OB|PTION_(READ_(BUFFER|TIMEOUT)|BLOCKING|WRITE_BUFFER))|U(RL_STAT_(QUIET|LINK)|SE_PATH)|P(EEK|F_(INET(6)?|UNIX))|ENFORCE_SAFE_MODE|FILTER_(READ|WRITE|ALL))|UNFUNCS_RET_(STRING|TIMESTAMP|DOUBLE)|QLITE(_(R(OW|EADONLY)|MIS(MATCH|USE)|B(OTH|USY)|SCHEMA|N(O(MEM|T(FOUND|ADB)|LFS)|UM)|C(O(RRUPT|NSTRAINT)|ANTOPEN)|TOOBIG|I(NTER(RUPT|NAL)|OERR)|OK|DONE|P(ROTOCOL|ERM)|E(RROR|MPTY)|F(ORMAT|ULL)|LOCKED|A(BORT|SSOC|UTH))|3_(B(OTH|LOB)|NU(M|LL)|TEXT|INTEGER|OPEN_(READ(ONLY|WRITE)|CREATE)|FLOAT|ASSOC)))|CURL(M(SG_DONE|_(BAD_(HANDLE|EASY_HANDLE)|CALL_MULTI_PERFORM|INTERNAL_ERROR|O(UT_OF_MEMORY|K)))|SSH_AUTH_(HOST|NONE|DEFAULT|P(UBLICKEY|ASSWORD)|KEYBOARD)|CLOSEPOLICY_(SLOWEST|CALLBACK|OLDEST|LEAST_(RECENTLY_USED|TRAFFIC))|_(HTTP_VERSION_(1_(1|0)|NONE)|NETRC_(REQUIRED|IGNORED|OPTIONAL)|TIMECOND_(IF(MODSINCE|UNMODSINCE)|LASTMOD)|IPRESOLVE_(V(4|6)|WHATEVER)|VERSION_(SSL|IPV6|KERBEROS4|LIBZ))|INFO_(RE(DIRECT_(COUNT|TIME)|QUEST_SIZE)|S(SL_VERIFYRESULT|TARTTRANSFER_TIME|IZE_(DOWNLOAD|UPLOAD)|PEED_(DOWNLOAD|UPLOAD))|H(TTP_CODE|EADER_(SIZE|OUT))|NAMELOOKUP_TIME|C(ON(NECT_TIME|TENT_(TYPE|LENGTH_(DOWNLOAD|UPLOAD)))|ERTINFO)|TOTAL_TIME|PR(IVATE|ETRANSFER_TIME)|EFFECTIVE_URL|FILETIME)|OPT_(R(E(SUME_FROM|TURNTRANSFER|DIR_PROTOCOLS|FERER|AD(DATA|FUNCTION))|AN(GE|DOM_FILE))|MAX(REDIRS|CONNECTS)|B(INARYTRANSFER|UFFERSIZE)|S(S(H_(HOST_PUBLIC_KEY_MD5|P(RIVATE_KEYFILE|UBLIC_KEYFILE)|AUTH_TYPES)|L(CERT(TYPE|PASSWD)?|_(CIPHER_LIST|VERIFY(HOST|PEER))|ENGINE(_DEFAULT)?|VERSION|KEY(TYPE|PASSWD)?))|TDERR)|H(TTP(GET|HEADER|200ALIASES|_VERSION|PROXYTUNNEL|AUTH)|EADER(FUNCTION)?)|N(O(BODY|SIGNAL|PROGRESS)|ETRC)|C(RLF|O(NNECTTIMEOUT(_MS)?|OKIE(SESSION|JAR|FILE)?)|USTOMREQUEST|ERTINFO|LOSEPOLICY|A(INFO|PATH))|T(RANSFERTEXT|CP_NODELAY|IME(CONDITION|OUT(_MS)?|VALUE))|I(N(TERFACE|FILE(SIZE)?)|PRESOLVE)|DNS_(CACHE_TIMEOUT|USE_GLOBAL_CACHE)|U(RL|SER(PWD|AGENT)|NRESTRICTED_AUTH|PLOAD)|P(R(IVATE|O(GRESSFUNCTION|XY(TYPE|USERPWD|PORT|AUTH)?|TOCOLS))|O(RT|ST(REDIR|QUOTE|FIELDS)?)|UT)|E(GDSOCKET|NCODING)|VERBOSE|K(RB4LEVEL|EYPASSWD)|QUOTE|F(RESH_CONNECT|TP(SSLAUTH|_(S(SL|KIP_PASV_IP)|CREATE_MISSING_DIRS|USE_EP(RT|SV)|FILEMETHOD)|PORT|LISTONLY|APPEND)|ILE(TIME)?|O(RBID_REUSE|LLOWLOCATION)|AILONERROR)|WRITE(HEADER|FUNCTION)|LOW_SPEED_(TIME|LIMIT)|AUTOREFERER)|PRO(XY_(SOCKS(4|5)|HTTP)|TO_(S(CP|FTP)|HTTP(S)?|T(ELNET|FTP)|DICT|F(TP(S)?|ILE)|LDAP(S)?|ALL))|E_(RE(CV_ERROR|AD_ERROR)|GOT_NOTHING|MALFORMAT_USER|BAD_(C(ONTENT_ENCODING|ALLING_ORDER)|PASSWORD_ENTERED|FUNCTION_ARGUMENT)|S(S(H|L_(C(IPHER|ONNECT_ERROR|ERTPROBLEM|ACERT)|PEER_CERTIFICATE|ENGINE_(SETFAILED|NOTFOUND)))|HARE_IN_USE|END_ERROR)|HTTP_(RANGE_ERROR|NOT_FOUND|PO(RT_FAILED|ST_ERROR))|COULDNT_(RESOLVE_(HOST|PROXY)|CONNECT)|T(OO_MANY_REDIRECTS|ELNET_OPTION_SYNTAX)|O(BSOLETE|UT_OF_MEMORY|PERATION_TIMEOUTED|K)|U(RL_MALFORMAT(_USER)?|N(SUPPORTED_PROTOCOL|KNOWN_TELNET_OPTION))|PARTIAL_FILE|F(TP_(BAD_DOWNLOAD_RESUME|SSL_FAILED|C(OULDNT_(RETR_FILE|GET_SIZE|S(TOR_FILE|ET_(BINARY|ASCII))|USE_REST)|ANT_(RECONNECT|GET_HOST))|USER_PASSWORD_INCORRECT|PORT_FAILED|QUOTE_ERROR|W(RITE_ERROR|EIRD_(SERVER_REPLY|227_FORMAT|USER_REPLY|PAS(S_REPLY|V_REPLY)))|ACCESS_DENIED)|ILE(SIZE_EXCEEDED|_COULDNT_READ_FILE)|UNCTION_NOT_FOUND|AILED_INIT)|WRITE_ERROR|L(IBRARY_NOT_FOUND|DAP_(SEARCH_FAILED|CANNOT_BIND|INVALID_URL))|ABORTED_BY_CALLBACK)|VERSION_NOW|FTP(METHOD_(MULTICWD|SINGLECWD|NOCWD)|SSL_(NONE|CONTROL|TRY|ALL)|AUTH_(SSL|TLS|DEFAULT))|AUTH_(GSSNEGOTIATE|BASIC|NTLM|DIGEST|ANY(SAFE)?))|I(MAGETYPE_(GIF|XBM|BMP|SWF|COUNT|TIFF_(MM|II)|I(CO|FF)|UNKNOWN|J(B2|P(X|2|C|EG(2000)?))|P(SD|NG)|WBMP)|NPUT_(REQUEST|GET|SE(RVER|SSION)|COOKIE|POST|ENV)|CONV_(MIME_DECODE_(STRICT|CONTINUE_ON_ERROR)|IMPL|VERSION))|D(NS_(MX|S(RV|OA)|HINFO|N(S|APTR)|CNAME|TXT|PTR|A(NY|LL|AAA|6)?)|OM(STRING_SIZE_ERR|_(SYNTAX_ERR|HIERARCHY_REQUEST_ERR|N(O(_(MODIFICATION_ALLOWED_ERR|DATA_ALLOWED_ERR)|T_(SUPPORTED_ERR|FOUND_ERR))|AMESPACE_ERR)|IN(DEX_SIZE_ERR|USE_ATTRIBUTE_ERR|VALID_(MODIFICATION_ERR|STATE_ERR|CHARACTER_ERR|ACCESS_ERR))|PHP_ERR|VALIDATION_ERR|WRONG_DOCUMENT_ERR)))|JSON_(HEX_(TAG|QUOT|A(MP|POS))|NUMERIC_CHECK|ERROR_(S(YNTAX|TATE_MISMATCH)|NONE|CTRL_CHAR|DEPTH|UTF8)|FORCE_OBJECT)|P(REG_(RECURSION_LIMIT_ERROR|GREP_INVERT|BA(CKTRACK_LIMIT_ERROR|D_UTF8_(OFFSET_ERROR|ERROR))|S(PLIT_(NO_EMPTY|OFFSET_CAPTURE|DELIM_CAPTURE)|ET_ORDER)|NO_ERROR|INTERNAL_ERROR|OFFSET_CAPTURE|PATTERN_ORDER)|SFS_(PASS_ON|ERR_FATAL|F(EED_ME|LAG_(NORMAL|FLUSH_(CLOSE|INC))))|CRE_VERSION|OSIX_(R_OK|X_OK|S_IF(REG|BLK|SOCK|CHR|IFO)|F_OK|W_OK))|F(NM_(NOESCAPE|CASEFOLD|P(ERIOD|ATHNAME))|IL(TER_(REQUIRE_(SCALAR|ARRAY)|SANITIZE_(MAGIC_QUOTES|S(TRI(NG|PPED)|PECIAL_CHARS)|NUMBER_(INT|FLOAT)|URL|E(MAIL|NCODED)|FULL_SPECIAL_CHARS)|NULL_ON_FAILURE|CALLBACK|DEFAULT|UNSAFE_RAW|VALIDATE_(REGEXP|BOOLEAN|I(NT|P)|URL|EMAIL|FLOAT)|F(ORCE_ARRAY|LAG_(S(CHEME_REQUIRED|TRIP_(BACKTICK|HIGH|LOW))|HOST_REQUIRED|NO(NE|_(RES_RANGE|PRIV_RANGE|ENCODE_QUOTES))|IPV(4|6)|PATH_REQUIRED|E(MPTY_STRING_NULL|NCODE_(HIGH|LOW|AMP))|QUERY_REQUIRED|ALLOW_(SCIENTIFIC|HEX|THOUSAND|OCTAL|FRACTION))))|E(_(BINARY|SKIP_EMPTY_LINES|NO_DEFAULT_CONTEXT|TEXT|IGNORE_NEW_LINES|USE_INCLUDE_PATH|APPEND)|INFO_(RAW|MIME(_(TYPE|ENCODING))?|SYMLINK|NONE|CONTINUE|DEVICES|PRESERVE_ATIME)))|ORCE_(GZIP|DEFLATE))|LIBXML_(XINCLUDE|N(SCLEAN|O(XMLDECL|BLANKS|NET|CDATA|E(RROR|MPTYTAG|NT)|WARNING))|COMPACT|D(TD(VALID|LOAD|ATTR)|OTTED_VERSION)|PARSEHUGE|ERR_(NONE|ERROR|FATAL|WARNING)|VERSION|LOADED_VERSION))\\b",
-              "name": "support.constant.ext.php"
+              }
             },
             {
+              "name": "support.constant.parser-token.php",
+              "match": "(\\\\)?\\bT_(RE(TURN|QUIRE(_ONCE)?)|G(OTO|LOBAL)|XOR_EQUAL|M(INUS_EQUAL|OD_EQUAL|UL_EQUAL|ETHOD_C|L_COMMENT)|B(REAK|OOL(_CAST|EAN_(OR|AND))|AD_CHARACTER)|S(R(_EQUAL)?|T(RING(_(CAST|VARNAME))?|A(RT_HEREDOC|TIC))|WITCH|L(_EQUAL)?)|HALT_COMPILER|N(S_(SEPARATOR|C)|UM_STRING|EW|AMESPACE)|C(HARACTER|O(MMENT|N(ST(ANT_ENCAPSED_STRING)?|CAT_EQUAL|TINUE))|URLY_OPEN|L(O(SE_TAG|NE)|ASS(_C)?)|A(SE|TCH))|T(RY|HROW)|I(MPLEMENTS|S(SET|_(GREATER_OR_EQUAL|SMALLER_OR_EQUAL|NOT_(IDENTICAL|EQUAL)|IDENTICAL|EQUAL))|N(STANCEOF|C(LUDE(_ONCE)?)?|T(_CAST|ERFACE)|LINE_HTML)|F)|O(R_EQUAL|BJECT_(CAST|OPERATOR)|PEN_TAG(_WITH_ECHO)?|LD_FUNCTION)|D(NUMBER|I(R|V_EQUAL)|O(C_COMMENT|UBLE_(C(OLON|AST)|ARROW)|LLAR_OPEN_CURLY_BRACES)?|E(C(LARE)?|FAULT))|U(SE|NSET(_CAST)?)|P(R(I(NT|VATE)|OTECTED)|UBLIC|LUS_EQUAL|AAMAYIM_NEKUDOTAYIM)|E(X(TENDS|IT)|MPTY|N(CAPSED_AND_WHITESPACE|D(SWITCH|_HEREDOC|IF|DECLARE|FOR(EACH)?|WHILE))|CHO|VAL|LSE(IF)?)|VAR(IABLE)?|F(I(NAL|LE)|OR(EACH)?|UNC(_C|TION))|WHI(TESPACE|LE)|L(NUMBER|I(ST|NE)|OGICAL_(XOR|OR|AND))|A(RRAY(_CAST)?|BSTRACT|S|ND_EQUAL))\\b",
               "captures": {
                 "1": {
                   "name": "punctuation.separator.inheritance.php"
                 }
-              },
-              "match": "(\\\\)?\\bT_(RE(TURN|QUIRE(_ONCE)?)|G(OTO|LOBAL)|XOR_EQUAL|M(INUS_EQUAL|OD_EQUAL|UL_EQUAL|ETHOD_C|L_COMMENT)|B(REAK|OOL(_CAST|EAN_(OR|AND))|AD_CHARACTER)|S(R(_EQUAL)?|T(RING(_(CAST|VARNAME))?|A(RT_HEREDOC|TIC))|WITCH|L(_EQUAL)?)|HALT_COMPILER|N(S_(SEPARATOR|C)|UM_STRING|EW|AMESPACE)|C(HARACTER|O(MMENT|N(ST(ANT_ENCAPSED_STRING)?|CAT_EQUAL|TINUE))|URLY_OPEN|L(O(SE_TAG|NE)|ASS(_C)?)|A(SE|TCH))|T(RY|HROW)|I(MPLEMENTS|S(SET|_(GREATER_OR_EQUAL|SMALLER_OR_EQUAL|NOT_(IDENTICAL|EQUAL)|IDENTICAL|EQUAL))|N(STANCEOF|C(LUDE(_ONCE)?)?|T(_CAST|ERFACE)|LINE_HTML)|F)|O(R_EQUAL|BJECT_(CAST|OPERATOR)|PEN_TAG(_WITH_ECHO)?|LD_FUNCTION)|D(NUMBER|I(R|V_EQUAL)|O(C_COMMENT|UBLE_(C(OLON|AST)|ARROW)|LLAR_OPEN_CURLY_BRACES)?|E(C(LARE)?|FAULT))|U(SE|NSET(_CAST)?)|P(R(I(NT|VATE)|OTECTED)|UBLIC|LUS_EQUAL|AAMAYIM_NEKUDOTAYIM)|E(X(TENDS|IT)|MPTY|N(CAPSED_AND_WHITESPACE|D(SWITCH|_HEREDOC|IF|DECLARE|FOR(EACH)?|WHILE))|CHO|VAL|LSE(IF)?)|VAR(IABLE)?|F(I(NAL|LE)|OR(EACH)?|UNC(_C|TION))|WHI(TESPACE|LE)|L(NUMBER|I(ST|NE)|OGICAL_(XOR|OR|AND))|A(RRAY(_CAST)?|BSTRACT|S|ND_EQUAL))\\b",
-              "name": "support.constant.parser-token.php"
+              }
             },
             {
-              "comment": "In PHP, any identifier which is not a variable is taken to be a constant.\n        \t\t\t\tHowever, if there is no constant defined with the given name then a notice\n        \t\t\t\tis generated and the constant is assumed to have the value of its name.",
-              "match": "[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*",
-              "name": "constant.other.php"
+              "name": "constant.other.php",
+              "match": "[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*"
             }
           ]
         }
@@ -336,7 +200,21 @@
           "include": "#comments"
         },
         {
-          "begin": "(?xi)\n\t\t\t\t\t\t\t\\s*(array) # Typehint\n\t\t\t\t\t\t\t\\s*(&)? \t\t\t\t\t# Reference\n\t\t\t\t\t\t\t\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*) # The variable name\n\t\t\t\t\t\t\t\\s*(=)\t# A default value\n\t\t\t\t\t\t\t\\s*(array)\\s*(\\()\n\t\t\t\t\t\t\t",
+          "name": "meta.function.argument.array.php",
+          "contentName": "meta.array.php",
+          "begin": "(?xi)\n\t\t\t\t\t\t\t\\s*(array) # Typehint\n\t\t\t\t\t\t\t\\s*(\u0026)? \t\t\t\t\t# Reference\n\t\t\t\t\t\t\t\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*) # The variable name\n\t\t\t\t\t\t\t\\s*(=)\t# A default value\n\t\t\t\t\t\t\t\\s*(array)\\s*(\\()\n\t\t\t\t\t\t\t",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#strings"
+            },
+            {
+              "include": "#numbers"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.php"
@@ -360,27 +238,15 @@
               "name": "punctuation.definition.array.begin.php"
             }
           },
-          "contentName": "meta.array.php",
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.php"
             }
-          },
-          "name": "meta.function.argument.array.php",
-          "patterns": [
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#strings"
-            },
-            {
-              "include": "#numbers"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.function.argument.array.php",
+          "match": "(?xi)\n\t\t\t\t\t\t\t\\s*(array) # Typehint\n\t\t\t\t\t\t\t\\s*(\u0026)? \t\t\t\t\t# Reference\n\t\t\t\t\t\t\t\\s*((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # The variable name\n\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\\s*(?:(=)\\s*(?:(null)|(\\[)\\s*(\\])|((?:\\S*?\\(\\))|(?:\\S*?))))\t# A default value\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment\n\t\t\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "storage.type.php"
@@ -409,19 +275,18 @@
             "9": {
               "name": "invalid.illegal.non-null-typehinted.php"
             }
-          },
-          "match": "(?xi)\n\t\t\t\t\t\t\t\\s*(array) # Typehint\n\t\t\t\t\t\t\t\\s*(&)? \t\t\t\t\t# Reference\n\t\t\t\t\t\t\t\\s*((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # The variable name\n\t\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t\t\\s*(?:(=)\\s*(?:(null)|(\\[)\\s*(\\])|((?:\\S*?\\(\\))|(?:\\S*?))))\t# A default value\n\t\t\t\t\t\t\t)?\n\t\t\t\t\t\t\t\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma or a comment\n\t\t\t\t\t\t\t",
-          "name": "meta.function.argument.array.php"
+          }
         },
         {
-          "begin": "(?i)(?=[a-z_0-9\\\\]*[a-z_][a-z_0-9]*\\s*&?\\s*\\$)",
-          "end": "(?=,|\\)|/[/*]|\\#|$)",
           "name": "meta.function.argument.typehinted.php",
+          "begin": "(?i)(?=[a-z_0-9\\\\]*[a-z_][a-z_0-9]*\\s*\u0026?\\s*\\$)",
+          "end": "(?=,|\\)|/[/*]|\\#|$)",
           "patterns": [
             {
               "include": "#class-name"
             },
             {
+              "match": "(?xi)\n        \t\t\t\t\t\t\t\\s*([a-z_][a-z_0-9]*)? # Typehinted class name\n        \t\t\t\t\t\t\t\\s*(\u0026)? \t\t\t\t\t# Reference\n        \t\t\t\t\t\t\t\\s*((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # The variable name\n        \t\t\t\t\t\t\t(?:\n        \t\t\t\t\t\t\t\t\\s*(?:(=)\\s*(?:(null)|((?:\\S*?\\(\\))|(?:\\S*?))))\t# A default value\n        \t\t\t\t\t\t\t)?\n        \t\t\t\t\t\t\t\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma\n\t\t\t\t\t        ",
               "captures": {
                 "1": {
                   "name": "support.class.php"
@@ -444,12 +309,13 @@
                 "7": {
                   "name": "invalid.illegal.non-null-typehinted.php"
                 }
-              },
-              "match": "(?xi)\n        \t\t\t\t\t\t\t\\s*([a-z_][a-z_0-9]*)? # Typehinted class name\n        \t\t\t\t\t\t\t\\s*(&)? \t\t\t\t\t# Reference\n        \t\t\t\t\t\t\t\\s*((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*) # The variable name\n        \t\t\t\t\t\t\t(?:\n        \t\t\t\t\t\t\t\t\\s*(?:(=)\\s*(?:(null)|((?:\\S*?\\(\\))|(?:\\S*?))))\t# A default value\n        \t\t\t\t\t\t\t)?\n        \t\t\t\t\t\t\t\\s*(?=,|\\)|/[/*]|\\#|$) # A closing parentheses (end of argument list) or a comma\n\t\t\t\t\t        "
+              }
             }
           ]
         },
         {
+          "name": "meta.function.argument.no-default.php",
+          "match": "(?:\\s*(\u0026))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*(?=,|\\)|/[/*]|\\#)",
           "captures": {
             "1": {
               "name": "storage.modifier.reference.php"
@@ -460,12 +326,17 @@
             "3": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "match": "(?:\\s*(&))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*(?=,|\\)|/[/*]|\\#)",
-          "name": "meta.function.argument.no-default.php"
+          }
         },
         {
-          "begin": "(?:\\s*(&))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?:\\s*(=)\\s*)\\s*",
+          "name": "meta.function.argument.default.php",
+          "begin": "(?:\\s*(\u0026))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(?:\\s*(=)\\s*)\\s*",
+          "end": "(?=,|\\)|/[/*]|\\#)",
+          "patterns": [
+            {
+              "include": "#parameter-default-types"
+            }
+          ],
           "captures": {
             "1": {
               "name": "storage.modifier.reference.php"
@@ -479,14 +350,7 @@
             "4": {
               "name": "keyword.operator.assignment.php"
             }
-          },
-          "end": "(?=,|\\)|/[/*]|\\#)",
-          "name": "meta.function.argument.default.php",
-          "patterns": [
-            {
-              "include": "#parameter-default-types"
-            }
-          ]
+          }
         }
       ]
     },
@@ -494,7 +358,6 @@
       "patterns": [
         {
           "begin": "(?i)(?=\\\\?[a-z_0-9\\\\]+\\\\[a-z_][a-z0-9_]*\\s*\\()",
-          "comment": "Functions in a user-defined namespace (overrides any built-ins)",
           "end": "(?=\\s*\\()",
           "patterns": [
             {
@@ -503,22 +366,16 @@
           ]
         },
         {
-          "match": "(?i)\\b(print|echo)\\b",
-          "name": "support.function.construct.php"
+          "name": "support.function.construct.php",
+          "match": "(?i)\\b(print|echo)\\b"
         },
         {
           "begin": "(?i)(\\\\)?(?=\\b[a-z_][a-z_0-9]*\\s*\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.separator.inheritance.php"
-            }
-          },
-          "comment": "Root namespace function calls (built-in or user)",
           "end": "(?=\\s*\\()",
           "patterns": [
             {
-              "match": "(?i)\\b(isset|unset|e(val|mpty)|list)(?=\\s*\\()",
-              "name": "support.function.construct.php"
+              "name": "support.function.construct.php",
+              "match": "(?i)\\b(isset|unset|e(val|mpty)|list)(?=\\s*\\()"
             },
             {
               "include": "#support"
@@ -526,15 +383,26 @@
             {
               "include": "#user-function-call"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.inheritance.php"
+            }
+          }
         }
       ]
     },
     "heredoc": {
       "patterns": [
         {
-          "begin": "(?=<<<\\s*(\"?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\1)\\s*$)",
+          "name": "string.unquoted.heredoc.php",
+          "begin": "(?=\u003c\u003c\u003c\\s*(\"?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\1)\\s*$)",
           "end": "(?!\\G)",
+          "patterns": [
+            {
+              "include": "#heredoc_interior"
+            }
+          ],
           "injections": {
             "*": {
               "patterns": [
@@ -543,18 +411,12 @@
                 }
               ]
             }
-          },
-          "name": "string.unquoted.heredoc.php",
-          "patterns": [
-            {
-              "include": "#heredoc_interior"
-            }
-          ]
+          }
         },
         {
-          "begin": "(?=<<<\\s*('?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\1)\\s*$)",
-          "end": "(?!\\G)",
           "name": "string.unquoted.heredoc.nowdoc.php",
+          "begin": "(?=\u003c\u003c\u003c\\s*('?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\1)\\s*$)",
+          "end": "(?!\\G)",
           "patterns": [
             {
               "include": "#heredoc_interior"
@@ -566,37 +428,15 @@
         "heredoc_interior": {
           "patterns": [
             {
-              "begin": "(<<<)\\s*(['\"]?)(HTML)(\\2)\\s*$\\n?",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.begin.php"
-                },
-                "1": {
-                  "name": "punctuation.definition.string.php"
-                },
-                "3": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
+              "name": "meta.embedded.html",
               "contentName": "text.html",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(HTML)(\\2)\\s*$\\n?",
               "end": "^(\\3)\\b",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.section.embedded.end.php"
-                },
-                "1": {
-                  "name": "keyword.operator.heredoc.php"
-                }
-              },
-              "name": "meta.embedded.html",
               "patterns": [
                 {
                   "include": "text.html.basic"
                 }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(XML)(\\2)\\s*$\\n?",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.begin.php"
@@ -608,8 +448,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "contentName": "text.xml",
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.end.php"
@@ -617,16 +455,18 @@
                 "1": {
                   "name": "keyword.operator.heredoc.php"
                 }
-              },
+              }
+            },
+            {
               "name": "meta.embedded.xml",
+              "contentName": "text.xml",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(XML)(\\2)\\s*$\\n?",
+              "end": "^(\\3)\\b",
               "patterns": [
                 {
                   "include": "text.xml"
                 }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(SQL)(\\2)\\s*$\\n?",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.begin.php"
@@ -638,8 +478,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "contentName": "source.sql",
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.end.php"
@@ -647,16 +485,18 @@
                 "1": {
                   "name": "keyword.operator.heredoc.php"
                 }
-              },
+              }
+            },
+            {
               "name": "meta.embedded.sql",
+              "contentName": "source.sql",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(SQL)(\\2)\\s*$\\n?",
+              "end": "^(\\3)\\b",
               "patterns": [
                 {
                   "include": "source.sql"
                 }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(JAVASCRIPT)(\\2)\\s*$\\n?",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.begin.php"
@@ -668,8 +508,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "contentName": "source.js",
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.end.php"
@@ -677,16 +515,18 @@
                 "1": {
                   "name": "keyword.operator.heredoc.php"
                 }
-              },
+              }
+            },
+            {
               "name": "meta.embedded.js",
+              "contentName": "source.js",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(JAVASCRIPT)(\\2)\\s*$\\n?",
+              "end": "^(\\3)\\b",
               "patterns": [
                 {
                   "include": "source.js"
                 }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(JSON)(\\2)\\s*$\\n?",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.begin.php"
@@ -698,8 +538,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "contentName": "source.json",
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.end.php"
@@ -707,16 +545,18 @@
                 "1": {
                   "name": "keyword.operator.heredoc.php"
                 }
-              },
+              }
+            },
+            {
               "name": "meta.embedded.json",
+              "contentName": "source.json",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(JSON)(\\2)\\s*$\\n?",
+              "end": "^(\\3)\\b",
               "patterns": [
                 {
                   "include": "source.json"
                 }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(CSS)(\\2)\\s*$\\n?",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.begin.php"
@@ -728,8 +568,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "contentName": "source.css",
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.end.php"
@@ -737,16 +575,18 @@
                 "1": {
                   "name": "keyword.operator.heredoc.php"
                 }
-              },
+              }
+            },
+            {
               "name": "meta.embedded.css",
+              "contentName": "source.css",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(CSS)(\\2)\\s*$\\n?",
+              "end": "^(\\3)\\b",
               "patterns": [
                 {
                   "include": "source.css"
                 }
-              ]
-            },
-            {
-              "begin": "(<<<)\\s*(['\"]?)(REGEX)(\\2)\\s*$\\n?",
+              ],
               "beginCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.begin.php"
@@ -758,8 +598,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "contentName": "string.regexp.heredoc.php",
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.embedded.end.php"
@@ -767,14 +605,20 @@
                 "1": {
                   "name": "keyword.operator.heredoc.php"
                 }
-              },
+              }
+            },
+            {
+              "contentName": "string.regexp.heredoc.php",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)(REGEX)(\\2)\\s*$\\n?",
+              "end": "^(\\3)\\b",
               "patterns": [
                 {
-                  "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
-                  "match": "(\\\\){1,2}[.$^\\[\\]{}]",
-                  "name": "constant.character.escape.regex.php"
+                  "name": "constant.character.escape.regex.php",
+                  "match": "(\\\\){1,2}[.$^\\[\\]{}]"
                 },
                 {
+                  "name": "string.regexp.arbitrary-repitition.php",
+                  "match": "(\\{)\\d+(,\\d+)?(\\})",
                   "captures": {
                     "1": {
                       "name": "punctuation.definition.arbitrary-repitition.php"
@@ -782,50 +626,67 @@
                     "3": {
                       "name": "punctuation.definition.arbitrary-repitition.php"
                     }
-                  },
-                  "match": "(\\{)\\d+(,\\d+)?(\\})",
-                  "name": "string.regexp.arbitrary-repitition.php"
+                  }
                 },
                 {
+                  "name": "string.regexp.character-class.php",
                   "begin": "\\[(?:\\^?\\])?",
-                  "captures": {
-                    "0": {
-                      "name": "punctuation.definition.character-class.php"
-                    }
-                  },
                   "end": "\\]",
-                  "name": "string.regexp.character-class.php",
                   "patterns": [
                     {
-                      "match": "\\\\[\\\\'\\[\\]]",
-                      "name": "constant.character.escape.php"
+                      "name": "constant.character.escape.php",
+                      "match": "\\\\[\\\\'\\[\\]]"
                     }
-                  ]
+                  ],
+                  "captures": {
+                    "0": {
+                      "name": "punctuation.definition.character-class.php"
+                    }
+                  }
                 },
                 {
-                  "match": "[$^+*]",
-                  "name": "keyword.operator.regexp.php"
+                  "name": "keyword.operator.regexp.php",
+                  "match": "[$^+*]"
                 },
                 {
-                  "begin": "(?<=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
+                  "name": "comment.line.number-sign.php",
+                  "begin": "(?\u003c=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
+                  "end": "$\\n?",
                   "beginCaptures": {
                     "1": {
                       "name": "punctuation.definition.comment.php"
                     }
                   },
-                  "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
-                  "end": "$\\n?",
                   "endCaptures": {
                     "0": {
                       "name": "punctuation.definition.comment.php"
                     }
-                  },
-                  "name": "comment.line.number-sign.php"
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.begin.php"
+                },
+                "1": {
+                  "name": "punctuation.definition.string.php"
+                },
+                "3": {
+                  "name": "keyword.operator.heredoc.php"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                },
+                "1": {
+                  "name": "keyword.operator.heredoc.php"
+                }
+              }
             },
             {
-              "begin": "(<<<)\\s*(['\"]?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\2)",
+              "begin": "(\u003c\u003c\u003c)\\s*(['\"]?)([a-zA-Z_]+[a-zA-Z0-9_]*)(\\2)",
+              "end": "^(\\3)\\b",
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.string.php"
@@ -834,7 +695,6 @@
                   "name": "keyword.operator.heredoc.php"
                 }
               },
-              "end": "^(\\3)\\b",
               "endCaptures": {
                 "1": {
                   "name": "keyword.operator.heredoc.php"
@@ -847,16 +707,11 @@
     },
     "instantiation": {
       "begin": "(?i)(new)\\s+",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.new.php"
-        }
-      },
       "end": "(?i)(?=[^$a-z0-9_\\\\])",
       "patterns": [
         {
-          "match": "(parent|static|self)(?=[^a-z0-9_])",
-          "name": "storage.type.php"
+          "name": "storage.type.php",
+          "match": "(parent|static|self)(?=[^a-z0-9_])"
         },
         {
           "include": "#class-name"
@@ -864,41 +719,45 @@
         {
           "include": "#variable-name"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.new.php"
+        }
+      }
     },
     "interpolation": {
-      "comment": "http://www.php.net/manual/en/language.types.string.php#language.types.string.parsing",
       "patterns": [
         {
-          "match": "\\\\[0-7]{1,3}",
-          "name": "constant.numeric.octal.php"
+          "name": "constant.numeric.octal.php",
+          "match": "\\\\[0-7]{1,3}"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f]{1,2}",
-          "name": "constant.numeric.hex.php"
+          "name": "constant.numeric.hex.php",
+          "match": "\\\\x[0-9A-Fa-f]{1,2}"
         },
         {
-          "match": "\\\\[enrt\\\\\\$\\\"]",
-          "name": "constant.character.escape.php"
+          "name": "constant.character.escape.php",
+          "match": "\\\\[enrt\\\\\\$\\\"]"
         },
         {
           "begin": "(\\{)(?=\\$.*?\\})",
+          "end": "(\\})",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(\\})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ]
+          }
         },
         {
           "include": "#variable-name"
@@ -906,6 +765,8 @@
       ]
     },
     "invoke-call": {
+      "name": "meta.function-call.invoke.php",
+      "match": "(?i)(\\$+)([a-z_][a-z_0-9]*)(?=\\s*\\()",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.php"
@@ -913,9 +774,7 @@
         "2": {
           "name": "variable.other.php"
         }
-      },
-      "match": "(?i)(\\$+)([a-z_][a-z_0-9]*)(?=\\s*\\()",
-      "name": "meta.function-call.invoke.php"
+      }
     },
     "language": {
       "patterns": [
@@ -923,15 +782,22 @@
           "include": "#comments"
         },
         {
-          "match": "\\{",
-          "name": "punctuation.section.scope.begin.php"
+          "name": "punctuation.section.scope.begin.php",
+          "match": "\\{"
         },
         {
-          "match": "\\}",
-          "name": "punctuation.section.scope.end.php"
+          "name": "punctuation.section.scope.end.php",
+          "match": "\\}"
         },
         {
+          "name": "meta.interface.php",
           "begin": "(?i)^\\s*(interface)\\s+([a-z0-9_]+)\\s*(extends)?\\s*",
+          "end": "((?:[a-zA-Z0-9_]+\\s*,\\s*)*)([a-zA-Z0-9_]+)?\\s*(?:(?=\\{)|$)",
+          "patterns": [
+            {
+              "include": "#namespace"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "storage.type.interface.php"
@@ -943,63 +809,45 @@
               "name": "storage.modifier.extends.php"
             }
           },
-          "end": "((?:[a-zA-Z0-9_]+\\s*,\\s*)*)([a-zA-Z0-9_]+)?\\s*(?:(?=\\{)|$)",
           "endCaptures": {
             "1": {
               "patterns": [
                 {
-                  "match": "[a-zA-Z0-9_]+",
-                  "name": "entity.other.inherited-class.php"
+                  "name": "entity.other.inherited-class.php",
+                  "match": "[a-zA-Z0-9_]+"
                 },
                 {
-                  "match": ",",
-                  "name": "punctuation.separator.classes.php"
+                  "name": "punctuation.separator.classes.php",
+                  "match": ","
                 }
               ]
             },
             "2": {
               "name": "entity.other.inherited-class.php"
             }
-          },
-          "name": "meta.interface.php",
-          "patterns": [
-            {
-              "include": "#namespace"
-            }
-          ]
+          }
         },
         {
-          "begin": "(?i)(?:^|(?<=<\\?php))\\s*(namespace)\\b\\s+(?=([a-z0-9_\\\\]+\\s*($|[;{]|(\\/[\\/*])))|$)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.namespace.php"
-            }
-          },
+          "name": "meta.namespace.php",
           "contentName": "entity.name.type.namespace.php",
+          "begin": "(?i)(?:^|(?\u003c=\u003c\\?php))\\s*(namespace)\\b\\s+(?=([a-z0-9_\\\\]+\\s*($|[;{]|(\\/[\\/*])))|$)",
           "end": "(?i)(?=\\s*$|[^a-z0-9_\\\\])",
-          "name": "meta.namespace.php",
           "patterns": [
             {
-              "match": "\\\\",
-              "name": "punctuation.separator.inheritance.php"
+              "name": "punctuation.separator.inheritance.php",
+              "match": "\\\\"
             }
-          ]
-        },
-        {
-          "begin": "(?i)\\s*\\b(use)\\s+(?:((const)|(function))\\s+)?",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.other.use.php"
-            },
-            "3": {
-              "name": "storage.type.const.php"
-            },
-            "4": {
-              "name": "storage.type.function.php"
+              "name": "keyword.other.namespace.php"
             }
-          },
-          "end": "(?=;|(?:^\\s*$))",
+          }
+        },
+        {
           "name": "meta.use.php",
+          "begin": "(?i)\\s*\\b(use)\\s+(?:((const)|(function))\\s+)?",
+          "end": "(?=;|(?:^\\s*$))",
           "patterns": [
             {
               "include": "#comments"
@@ -1007,38 +855,51 @@
             {
               "begin": "(?i)\\s*(?=[a-z_0-9\\\\])",
               "end": "(?xi)(?:\n    \t\t\t                (?:\\s*(as)\\b\\s*([a-z_0-9]*)\\s*(?=,|;|$))\n    \t\t\t                |(?=,|;|$)\n    \t\t\t            )",
-              "endCaptures": {
-                "1": {
-                  "name": "keyword.other.use-as.php"
-                },
-                "2": {
-                  "name": "support.other.namespace.use-as.php"
-                }
-              },
               "patterns": [
                 {
                   "include": "#class-builtin"
                 },
                 {
+                  "name": "support.other.namespace.use.php",
                   "begin": "(?i)\\s*(?=[\\\\a-z_0-9])",
                   "end": "$|(?=[\\s,;])",
-                  "name": "support.other.namespace.use.php",
                   "patterns": [
                     {
-                      "match": "\\\\",
-                      "name": "punctuation.separator.inheritance.php"
+                      "name": "punctuation.separator.inheritance.php",
+                      "match": "\\\\"
                     }
                   ]
                 }
-              ]
+              ],
+              "endCaptures": {
+                "1": {
+                  "name": "keyword.other.use-as.php"
+                },
+                "2": {
+                  "name": "support.other.namespace.use-as.php"
+                }
+              }
             },
             {
               "match": "\\s*,\\s*"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.use.php"
+            },
+            "3": {
+              "name": "storage.type.const.php"
+            },
+            "4": {
+              "name": "storage.type.function.php"
+            }
+          }
         },
         {
+          "name": "meta.trait.php",
           "begin": "(?i)^\\s*(trait)\\s+([a-zA-Z0-9_]+)",
+          "end": "(?=\\{)",
           "beginCaptures": {
             "1": {
               "name": "storage.type.trait.php"
@@ -1046,52 +907,34 @@
             "2": {
               "name": "entity.name.type.trait.php"
             }
-          },
-          "end": "(?=\\{)",
-          "name": "meta.trait.php"
+          }
         },
         {
+          "name": "meta.class.php",
           "begin": "(?i)^\\s*(abstract|final)?\\s*(class)\\s+([a-z0-9_]+)\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.modifier.abstract.php"
-            },
-            "2": {
-              "name": "storage.type.class.php"
-            },
-            "3": {
-              "name": "entity.name.type.class.php"
-            }
-          },
           "end": "(?=[;{])",
-          "name": "meta.class.php",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "begin": "(?i)(extends)\\s+",
-              "beginCaptures": {
-                "1": {
-                  "name": "storage.modifier.extends.php"
-                }
-              },
               "contentName": "meta.other.inherited-class.php",
+              "begin": "(?i)(extends)\\s+",
               "end": "(?i)(?=[^a-z_0-9\\\\])",
               "patterns": [
                 {
                   "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
                   "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
-                  "endCaptures": {
-                    "1": {
-                      "name": "entity.other.inherited-class.php"
-                    }
-                  },
                   "patterns": [
                     {
                       "include": "#namespace"
                     }
-                  ]
+                  ],
+                  "endCaptures": {
+                    "1": {
+                      "name": "entity.other.inherited-class.php"
+                    }
+                  }
                 },
                 {
                   "include": "#class-builtin"
@@ -1100,41 +943,41 @@
                   "include": "#namespace"
                 },
                 {
-                  "match": "(?i)[a-z_][a-z_0-9]*",
-                  "name": "entity.other.inherited-class.php"
+                  "name": "entity.other.inherited-class.php",
+                  "match": "(?i)[a-z_][a-z_0-9]*"
                 }
-              ]
-            },
-            {
-              "begin": "(?i)(implements)\\s+",
+              ],
               "beginCaptures": {
                 "1": {
-                  "name": "storage.modifier.implements.php"
+                  "name": "storage.modifier.extends.php"
                 }
-              },
+              }
+            },
+            {
+              "begin": "(?i)(implements)\\s+",
               "end": "(?i)(?=[;{])",
               "patterns": [
                 {
                   "include": "#comments"
                 },
                 {
-                  "begin": "(?i)(?=[a-z0-9_\\\\]+)",
                   "contentName": "meta.other.inherited-class.php",
+                  "begin": "(?i)(?=[a-z0-9_\\\\]+)",
                   "end": "(?i)(?:\\s*(?:,|(?=[^a-z0-9_\\\\\\s]))\\s*)",
                   "patterns": [
                     {
                       "begin": "(?i)(?=\\\\?[a-z_0-9]+\\\\)",
                       "end": "(?i)([a-z_][a-z_0-9]*)?(?=[^a-z0-9_\\\\])",
-                      "endCaptures": {
-                        "1": {
-                          "name": "entity.other.inherited-class.php"
-                        }
-                      },
                       "patterns": [
                         {
                           "include": "#namespace"
                         }
-                      ]
+                      ],
+                      "endCaptures": {
+                        "1": {
+                          "name": "entity.other.inherited-class.php"
+                        }
+                      }
                     },
                     {
                       "include": "#class-builtin"
@@ -1143,46 +986,68 @@
                       "include": "#namespace"
                     },
                     {
-                      "match": "(?i)[a-z_][a-z_0-9]*",
-                      "name": "entity.other.inherited-class.php"
+                      "name": "entity.other.inherited-class.php",
+                      "match": "(?i)[a-z_][a-z_0-9]*"
                     }
                   ]
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "storage.modifier.implements.php"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.modifier.abstract.php"
+            },
+            "2": {
+              "name": "storage.type.class.php"
+            },
+            "3": {
+              "name": "entity.name.type.class.php"
+            }
+          }
         },
         {
+          "match": "\\s*\\b((break|c(ase|ontinue)|d(e(clare|fault)|ie|o)|e(lse(if)?|nd(declare|for(each)?|if|switch|while)|xit)|for(each)?|if|return|switch|use|while|yield))\\b",
           "captures": {
             "1": {
               "name": "keyword.control.php"
             }
-          },
-          "match": "\\s*\\b((break|c(ase|ontinue)|d(e(clare|fault)|ie|o)|e(lse(if)?|nd(declare|for(each)?|if|switch|while)|xit)|for(each)?|if|return|switch|use|while|yield))\\b"
+          }
         },
         {
+          "name": "meta.include.php",
           "begin": "(?i)\\b((?:require|include)(?:_once)?)\\b\\s*",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.import.include.php"
-            }
-          },
           "end": "(?=\\s|;|$)",
-          "name": "meta.include.php",
           "patterns": [
             {
               "include": "#language"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.import.include.php"
+            }
+          }
         },
         {
+          "name": "meta.catch.php",
           "begin": "\\b(catch)\\b\\s*\\(\\s*",
+          "end": "([A-Za-z_][A-Za-z_0-9]*)\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*\\)",
+          "patterns": [
+            {
+              "include": "#namespace"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.exception.catch.php"
             }
           },
-          "end": "([A-Za-z_][A-Za-z_0-9]*)\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*\\)",
           "endCaptures": {
             "1": {
               "name": "support.class.exception.php"
@@ -1193,69 +1058,44 @@
             "3": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "name": "meta.catch.php",
-          "patterns": [
-            {
-              "include": "#namespace"
-            }
-          ]
+          }
         },
         {
-          "match": "\\b(catch|try|throw|exception|finally)\\b",
-          "name": "keyword.control.exception.php"
+          "name": "keyword.control.exception.php",
+          "match": "\\b(catch|try|throw|exception|finally)\\b"
         },
         {
-          "begin": "(?i)\\b(function)\\s*(&\\s*)?(?=\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "storage.type.function.php"
-            },
-            "2": {
-              "name": "storage.modifier.reference.php"
-            }
-          },
-          "end": "\\{",
           "name": "meta.function.closure.php",
+          "begin": "(?i)\\b(function)\\s*(\u0026\\s*)?(?=\\()",
+          "end": "\\{",
           "patterns": [
             {
-              "begin": "(\\()",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.parameters.begin.php"
-                }
-              },
               "contentName": "meta.function.arguments.php",
+              "begin": "(\\()",
               "end": "(\\))",
-              "endCaptures": {
-                "1": {
-                  "name": "punctuation.definition.parameters.end.php"
-                }
-              },
               "patterns": [
                 {
                   "include": "#function-arguments"
                 }
-              ]
-            },
-            {
-              "begin": "(?i)(use)\\s*(\\()",
+              ],
               "beginCaptures": {
                 "1": {
-                  "name": "keyword.other.function.use.php"
-                },
-                "2": {
                   "name": "punctuation.definition.parameters.begin.php"
                 }
               },
-              "end": "(\\))",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.parameters.end.php"
                 }
-              },
+              }
+            },
+            {
+              "begin": "(?i)(use)\\s*(\\()",
+              "end": "(\\))",
               "patterns": [
                 {
+                  "name": "meta.function.closure.use.php",
+                  "match": "(?:\\s*(\u0026))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*(?=,|\\))",
                   "captures": {
                     "1": {
                       "name": "storage.modifier.reference.php"
@@ -1266,22 +1106,49 @@
                     "3": {
                       "name": "punctuation.definition.variable.php"
                     }
-                  },
-                  "match": "(?:\\s*(&))?\\s*((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\\s*(?=,|\\))",
-                  "name": "meta.function.closure.use.php"
+                  }
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.other.function.use.php"
+                },
+                "2": {
+                  "name": "punctuation.definition.parameters.begin.php"
+                }
+              },
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.end.php"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type.function.php"
+            },
+            "2": {
+              "name": "storage.modifier.reference.php"
+            }
+          }
         },
         {
-          "begin": "(?x)\\s*\n\t\t\t\t\t    ((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n\t\t\t\t        (function)\n\t\t\t\t        (?:\\s+|(\\s*&\\s*))\n\t\t\t\t        (?:\n\t\t\t\t            (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic))\n\t\t\t\t            |([a-zA-Z0-9_]+)\n\t\t\t\t        )\n\t\t\t\t        \\s*\n\t\t\t\t        (\\()",
+          "name": "meta.function.php",
+          "contentName": "meta.function.arguments.php",
+          "begin": "(?x)\\s*\n\t\t\t\t\t    ((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n\t\t\t\t        (function)\n\t\t\t\t        (?:\\s+|(\\s*\u0026\\s*))\n\t\t\t\t        (?:\n\t\t\t\t            (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic))\n\t\t\t\t            |([a-zA-Z0-9_]+)\n\t\t\t\t        )\n\t\t\t\t        \\s*\n\t\t\t\t        (\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#function-arguments"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "patterns": [
                 {
-                  "match": "final|abstract|public|private|protected|static",
-                  "name": "storage.modifier.php"
+                  "name": "storage.modifier.php",
+                  "match": "final|abstract|public|private|protected|static"
                 }
               ]
             },
@@ -1301,19 +1168,11 @@
               "name": "punctuation.definition.parameters.begin.php"
             }
           },
-          "contentName": "meta.function.arguments.php",
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.parameters.end.php"
             }
-          },
-          "name": "meta.function.php",
-          "patterns": [
-            {
-              "include": "#function-arguments"
-            }
-          ]
+          }
         },
         {
           "include": "#invoke-call"
@@ -1321,6 +1180,18 @@
         {
           "begin": "(?xi)\\s*(?=\n\t\t\t\t        [a-z_0-9$\\\\]+(::)\n                        (?:\n        \t\t\t\t    ([a-z_][a-z_0-9]*)\\s*\\(\n        \t\t\t\t    |\n        \t\t\t\t    ((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n        \t\t\t\t    |\n        \t\t\t\t    ([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n        \t\t\t\t)?\n\t\t\t\t    )",
           "end": "(?x)(::)\n                        (?:\n        \t\t\t\t    ([A-Za-z_][A-Za-z_0-9]*)\\s*\\(\n        \t\t\t\t    |\n        \t\t\t\t    ((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n        \t\t\t\t    |\n        \t\t\t\t    ([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n        \t\t\t\t)?",
+          "patterns": [
+            {
+              "name": "storage.type.php",
+              "match": "(self|static|parent)\\b"
+            },
+            {
+              "include": "#class-name"
+            },
+            {
+              "include": "#variable-name"
+            }
+          ],
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1337,19 +1208,7 @@
             "5": {
               "name": "constant.other.class.php"
             }
-          },
-          "patterns": [
-            {
-              "match": "(self|static|parent)\\b",
-              "name": "storage.type.php"
-            },
-            {
-              "include": "#class-name"
-            },
-            {
-              "include": "#variable-name"
-            }
-          ]
+          }
         },
         {
           "include": "#variables"
@@ -1358,6 +1217,8 @@
           "include": "#strings"
         },
         {
+          "name": "meta.array.empty.php",
+          "match": "(array)(\\()(\\))",
           "captures": {
             "1": {
               "name": "support.function.construct.php"
@@ -1368,12 +1229,17 @@
             "3": {
               "name": "punctuation.definition.array.end.php"
             }
-          },
-          "match": "(array)(\\()(\\))",
-          "name": "meta.array.empty.php"
+          }
         },
         {
+          "name": "meta.array.php",
           "begin": "(array)(\\()",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.construct.php"
@@ -1382,54 +1248,48 @@
               "name": "punctuation.definition.array.begin.php"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.php"
             }
-          },
-          "name": "meta.array.php",
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ]
+          }
         },
         {
+          "match": "(?i)\\s*\\(\\s*(array|real|double|float|int(eger)?|bool(ean)?|string|object|binary|unset)\\s*\\)",
           "captures": {
             "1": {
               "name": "storage.type.php"
             }
-          },
-          "match": "(?i)\\s*\\(\\s*(array|real|double|float|int(eger)?|bool(ean)?|string|object|binary|unset)\\s*\\)"
+          }
         },
         {
-          "match": "(?i)\\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|clone|var|function|interface|parent|self|object)\\b",
-          "name": "storage.type.php"
+          "name": "storage.type.php",
+          "match": "(?i)\\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|clone|var|function|interface|parent|self|object)\\b"
         },
         {
-          "match": "(?i)\\b(global|abstract|const|extends|implements|final|p(r(ivate|otected)|ublic)|static)\\b",
-          "name": "storage.modifier.php"
+          "name": "storage.modifier.php",
+          "match": "(?i)\\b(global|abstract|const|extends|implements|final|p(r(ivate|otected)|ublic)|static)\\b"
         },
         {
           "include": "#object"
         },
         {
-          "match": ";",
-          "name": "punctuation.terminator.expression.php"
+          "name": "punctuation.terminator.expression.php",
+          "match": ";"
         },
         {
           "include": "#heredoc"
         },
         {
-          "match": "\\.=?",
-          "name": "keyword.operator.string.php"
+          "name": "keyword.operator.string.php",
+          "match": "\\.=?"
         },
         {
-          "match": "=>",
-          "name": "keyword.operator.key.php"
+          "name": "keyword.operator.key.php",
+          "match": "=\u003e"
         },
         {
+          "match": "(?:(\\=)(\u0026))|(\u0026(?=[$A-Za-z_]))",
           "captures": {
             "1": {
               "name": "keyword.operator.assignment.php"
@@ -1440,47 +1300,41 @@
             "3": {
               "name": "storage.modifier.reference.php"
             }
-          },
-          "match": "(?:(\\=)(&))|(&(?=[$A-Za-z_]))"
+          }
         },
         {
-          "match": "(@)",
-          "name": "keyword.operator.error-control.php"
+          "name": "keyword.operator.error-control.php",
+          "match": "(@)"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.php"
+          "name": "keyword.operator.increment-decrement.php",
+          "match": "(\\-\\-|\\+\\+)"
         },
         {
-          "match": "(\\-|\\+|\\*|/|%)",
-          "name": "keyword.operator.arithmetic.php"
+          "name": "keyword.operator.arithmetic.php",
+          "match": "(\\-|\\+|\\*|/|%)"
         },
         {
-          "match": "(?i)(!|&&|\\|\\|)|\\b(and|or|xor|as)\\b",
-          "name": "keyword.operator.logical.php"
+          "name": "keyword.operator.logical.php",
+          "match": "(?i)(!|\u0026\u0026|\\|\\|)|\\b(and|or|xor|as)\\b"
         },
         {
           "include": "#function-call"
         },
         {
-          "match": "<<|>>|~|\\^|&|\\|",
-          "name": "keyword.operator.bitwise.php"
+          "name": "keyword.operator.bitwise.php",
+          "match": "\u003c\u003c|\u003e\u003e|~|\\^|\u0026|\\|"
         },
         {
-          "match": "(===|==|!==|!=|<=|>=|<>|<|>)",
-          "name": "keyword.operator.comparison.php"
+          "name": "keyword.operator.comparison.php",
+          "match": "(===|==|!==|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
         },
         {
-          "match": "=",
-          "name": "keyword.operator.assignment.php"
+          "name": "keyword.operator.assignment.php",
+          "match": "="
         },
         {
           "begin": "(?i)\\b(instanceof)\\b\\s+(?=[\\\\$a-z_])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.type.php"
-            }
-          },
           "end": "(?=[^\\\\$A-Za-z_0-9])",
           "patterns": [
             {
@@ -1489,7 +1343,12 @@
             {
               "include": "#variable-name"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.type.php"
+            }
+          }
         },
         {
           "include": "#numbers"
@@ -1498,6 +1357,7 @@
           "include": "#instantiation"
         },
         {
+          "match": "(?i)(goto)\\s+([a-z_][a-z_0-9]*)",
           "captures": {
             "1": {
               "name": "keyword.control.goto.php"
@@ -1505,38 +1365,37 @@
             "2": {
               "name": "support.other.php"
             }
-          },
-          "match": "(?i)(goto)\\s+([a-z_][a-z_0-9]*)"
+          }
         },
         {
+          "match": "(?i)^\\s*([a-z_][a-z_0-9]*)\\s*:",
           "captures": {
             "1": {
               "name": "entity.name.goto-label.php"
             }
-          },
-          "match": "(?i)^\\s*([a-z_][a-z_0-9]*)\\s*:"
+          }
         },
         {
           "include": "#string-backtick"
         },
         {
           "begin": "\\[",
+          "end": "\\]",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.array.begin.php"
             }
           },
-          "end": "\\]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.array.end.php"
             }
-          },
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ]
+          }
         },
         {
           "include": "#constants"
@@ -1544,36 +1403,42 @@
       ]
     },
     "namespace": {
+      "name": "support.other.namespace.php",
       "begin": "(?i)(?:(namespace)|[a-z0-9_]+)?(\\\\)(?=.*?[^a-z_0-9\\\\])",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.language.namespace.php"
-        },
-        "2": {
-          "name": "punctuation.separator.inheritance.php"
-        }
-      },
       "end": "(?i)(?=[a-z0-9_]*[^a-z0-9_\\\\])",
-      "name": "support.other.namespace.php",
       "patterns": [
         {
+          "match": "(?i)(\\\\)",
           "captures": {
             "1": {
               "name": "punctuation.separator.inheritance.php"
             }
-          },
-          "match": "(?i)(\\\\)"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.language.namespace.php"
+        },
+        "2": {
+          "name": "punctuation.separator.inheritance.php"
+        }
+      }
     },
     "numbers": {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-      "name": "constant.numeric.php"
+      "name": "constant.numeric.php",
+      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b"
     },
     "object": {
       "patterns": [
         {
-          "begin": "(->)(\\$?\\{)",
+          "begin": "(-\u003e)(\\$?\\{)",
+          "end": "(\\})",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1582,19 +1447,14 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(\\})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "patterns": [
-            {
-              "include": "#language"
-            }
-          ]
+          }
         },
         {
+          "match": "(?x)(-\u003e)\n            \t\t\t\t(?:\n            \t\t\t\t    ([A-Za-z_][A-Za-z_0-9]*)\\s*\\(\n            \t\t\t\t    |\n            \t\t\t\t    ((\\$+)?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n            \t\t\t\t)?",
           "captures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1608,8 +1468,7 @@
             "4": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "match": "(?x)(->)\n            \t\t\t\t(?:\n            \t\t\t\t    ([A-Za-z_][A-Za-z_0-9]*)\\s*\\(\n            \t\t\t\t    |\n            \t\t\t\t    ((\\$+)?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n            \t\t\t\t)?"
+          }
         }
       ]
     },
@@ -1628,19 +1487,26 @@
           "include": "#variables"
         },
         {
-          "match": "=>",
-          "name": "keyword.operator.key.php"
+          "name": "keyword.operator.key.php",
+          "match": "=\u003e"
         },
         {
-          "match": "=",
-          "name": "keyword.operator.assignment.php"
+          "name": "keyword.operator.assignment.php",
+          "match": "="
         },
         {
-          "match": "&(?=\\s*\\$)",
-          "name": "storage.modifier.reference.php"
+          "name": "storage.modifier.reference.php",
+          "match": "\u0026(?=\\s*\\$)"
         },
         {
+          "name": "meta.array.php",
           "begin": "(array)\\s*(\\()",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#parameter-default-types"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "support.function.construct.php"
@@ -1649,18 +1515,11 @@
               "name": "punctuation.definition.array.begin.php"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.array.end.php"
             }
-          },
-          "name": "meta.array.php",
-          "patterns": [
-            {
-              "include": "#parameter-default-types"
-            }
-          ]
+          }
         },
         {
           "include": "#instantiation"
@@ -1668,6 +1527,11 @@
         {
           "begin": "(?xi)\\s*(?=\n\t\t\t\t        [a-z_0-9\\\\]+(::)\n    \t\t\t\t    ([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?\n\t\t\t\t    )",
           "end": "(?i)(::)([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)?",
+          "patterns": [
+            {
+              "include": "#class-name"
+            }
+          ],
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1675,12 +1539,7 @@
             "2": {
               "name": "constant.other.class.php"
             }
-          },
-          "patterns": [
-            {
-              "include": "#class-name"
-            }
-          ]
+          }
         },
         {
           "include": "#constants"
@@ -1690,11 +1549,11 @@
     "php_doc": {
       "patterns": [
         {
-          "comment": "PHPDocumentor only recognises lines with an asterisk as the first non-whitespaces character",
-          "match": "^(?!\\s*\\*).*$\\n?",
-          "name": "invalid.illegal.missing-asterisk.phpdoc.php"
+          "name": "invalid.illegal.missing-asterisk.phpdoc.php",
+          "match": "^(?!\\s*\\*).*$\\n?"
         },
         {
+          "match": "^\\s*\\*\\s*(@access)\\s+((public|private|protected)|(.+))\\s*$",
           "captures": {
             "1": {
               "name": "keyword.other.phpdoc.php"
@@ -1705,10 +1564,10 @@
             "4": {
               "name": "invalid.illegal.wrong-access-type.phpdoc.php"
             }
-          },
-          "match": "^\\s*\\*\\s*(@access)\\s+((public|private|protected)|(.+))\\s*$"
+          }
         },
         {
+          "match": "(@xlink)\\s+(.+)\\s*$",
           "captures": {
             "1": {
               "name": "keyword.other.phpdoc.php"
@@ -1716,48 +1575,38 @@
             "2": {
               "name": "markup.underline.link.php"
             }
-          },
-          "match": "(@xlink)\\s+(.+)\\s*$"
+          }
         },
         {
-          "match": "\\@(a(bstract|uthor)|c(ategory|opyright)|example|global|internal|li(cense|nk)|pa(ckage|ram)|return|s(ee|ince|tatic|ubpackage)|t(hrows|odo)|v(ar|ersion)|uses|deprecated|final|ignore)\\b",
-          "name": "keyword.other.phpdoc.php"
+          "name": "keyword.other.phpdoc.php",
+          "match": "\\@(a(bstract|uthor)|c(ategory|opyright)|example|global|internal|li(cense|nk)|pa(ckage|ram)|return|s(ee|ince|tatic|ubpackage)|t(hrows|odo)|v(ar|ersion)|uses|deprecated|final|ignore)\\b"
         },
         {
+          "name": "meta.tag.inline.phpdoc.php",
+          "match": "\\{(@(link)).+?\\}",
           "captures": {
             "1": {
               "name": "keyword.other.phpdoc.php"
             }
-          },
-          "match": "\\{(@(link)).+?\\}",
-          "name": "meta.tag.inline.phpdoc.php"
+          }
         }
       ]
-    },
-    "regex-double-quoted": {
-      "begin": "(?x)\"/ (?= (\\\\.|[^\"/])++/[imsxeADSUXu]*\" )",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.php"
-        }
-      },
-      "end": "(/)([imsxeADSUXu]*)(\")",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.php"
-        }
-      },
+    },
+    "regex-double-quoted": {
       "name": "string.regexp.double-quoted.php",
+      "begin": "(?x)\"/ (?= (\\\\.|[^\"/])++/[imsxeADSUXu]*\" )",
+      "end": "(/)([imsxeADSUXu]*)(\")",
       "patterns": [
         {
-          "comment": "Escaped from the regexp – there can also be 2 backslashes (since 1 will escape the first)",
-          "match": "(\\\\){1,2}[.$^\\[\\]{}]",
-          "name": "constant.character.escape.regex.php"
+          "name": "constant.character.escape.regex.php",
+          "match": "(\\\\){1,2}[.$^\\[\\]{}]"
         },
         {
           "include": "#interpolation"
         },
         {
+          "name": "string.regexp.arbitrary-repitition.php",
+          "match": "(\\{)\\d+(,\\d+)?(\\})",
           "captures": {
             "1": {
               "name": "punctuation.definition.arbitrary-repitition.php"
@@ -1765,47 +1614,47 @@
             "3": {
               "name": "punctuation.definition.arbitrary-repitition.php"
             }
-          },
-          "match": "(\\{)\\d+(,\\d+)?(\\})",
-          "name": "string.regexp.arbitrary-repitition.php"
+          }
         },
         {
+          "name": "string.regexp.character-class.php",
           "begin": "\\[(?:\\^?\\])?",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.character-class.php"
-            }
-          },
           "end": "\\]",
-          "name": "string.regexp.character-class.php",
           "patterns": [
             {
               "include": "#interpolation"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.character-class.php"
+            }
+          }
         },
         {
-          "match": "[$^+*]",
-          "name": "keyword.operator.regexp.php"
+          "name": "keyword.operator.regexp.php",
+          "match": "[$^+*]"
         }
-      ]
-    },
-    "regex-single-quoted": {
-      "begin": "(?x)'/ (?= ( \\\\ (?: \\\\ (?: \\\\ [\\\\']? | [^'] ) | . ) | [^'/] )++/[imsxeADSUXu]*' )",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "end": "(/)([imsxeADSUXu]*)(')",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.php"
         }
-      },
+      }
+    },
+    "regex-single-quoted": {
       "name": "string.regexp.single-quoted.php",
+      "begin": "(?x)'/ (?= ( \\\\ (?: \\\\ (?: \\\\ [\\\\']? | [^'] ) | . ) | [^'/] )++/[imsxeADSUXu]*' )",
+      "end": "(/)([imsxeADSUXu]*)(')",
       "patterns": [
         {
+          "name": "string.regexp.arbitrary-repitition.php",
+          "match": "(\\{)\\d+(,\\d+)?(\\})",
           "captures": {
             "1": {
               "name": "punctuation.definition.arbitrary-repitition.php"
@@ -1813,83 +1662,78 @@
             "3": {
               "name": "punctuation.definition.arbitrary-repitition.php"
             }
-          },
-          "match": "(\\{)\\d+(,\\d+)?(\\})",
-          "name": "string.regexp.arbitrary-repitition.php"
+          }
         },
         {
+          "name": "string.regexp.character-class.php",
           "begin": "\\[(?:\\^?\\])?",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.character-class.php"
-            }
-          },
           "end": "\\]",
-          "name": "string.regexp.character-class.php",
           "patterns": [
             {
               "include": "#single_quote_regex_escape"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.character-class.php"
+            }
+          }
         },
         {
-          "match": "[$^+*]",
-          "name": "keyword.operator.regexp.php"
+          "name": "keyword.operator.regexp.php",
+          "match": "[$^+*]"
         },
         {
           "include": "#single_quote_regex_escape"
         }
       ],
-      "repository": {
-        "single_quote_regex_escape": {
-          "comment": "Support both PHP string and regex escaping",
-          "match": "(?x) \\\\ (?: \\\\ (?: \\\\ [\\\\']? | [^'] ) | . )",
-          "name": "constant.character.escape.php"
-        }
-      }
-    },
-    "sql-string-double-quoted": {
-      "begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "contentName": "source.sql.embedded.php",
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.php"
         }
       },
+      "repository": {
+        "single_quote_regex_escape": {
+          "name": "constant.character.escape.php",
+          "match": "(?x) \\\\ (?: \\\\ (?: \\\\ [\\\\']? | [^'] ) | . )"
+        }
+      }
+    },
+    "sql-string-double-quoted": {
       "name": "string.quoted.double.sql.php",
+      "contentName": "source.sql.embedded.php",
+      "begin": "\"\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",
+      "end": "\"",
       "patterns": [
         {
-          "match": "#(\\\\\"|[^\"])*(?=\"|$\\n?)",
-          "name": "comment.line.number-sign.sql"
+          "name": "comment.line.number-sign.sql",
+          "match": "#(\\\\\"|[^\"])*(?=\"|$\\n?)"
         },
         {
-          "match": "--(\\\\\"|[^\"])*(?=\"|$\\n?)",
-          "name": "comment.line.double-dash.sql"
+          "name": "comment.line.double-dash.sql",
+          "match": "--(\\\\\"|[^\"])*(?=\"|$\\n?)"
         },
         {
-          "match": "\\\\[\\\\\"`']",
-          "name": "constant.character.escape.php"
+          "name": "constant.character.escape.php",
+          "match": "\\\\[\\\\\"`']"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\n\t\t\t\t\tSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
-          "match": "'(?=((\\\\')|[^'\"])*(\"|$))",
-          "name": "string.quoted.single.unclosed.sql"
+          "name": "string.quoted.single.unclosed.sql",
+          "match": "'(?=((\\\\')|[^'\"])*(\"|$))"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\n\t\t\t\t\tSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
-          "match": "`(?=((\\\\`)|[^`\"])*(\"|$))",
-          "name": "string.quoted.other.backtick.unclosed.sql"
+          "name": "string.quoted.other.backtick.unclosed.sql",
+          "match": "`(?=((\\\\`)|[^`\"])*(\"|$))"
         },
         {
+          "name": "string.quoted.single.sql",
           "begin": "'",
           "end": "'",
-          "name": "string.quoted.single.sql",
           "patterns": [
             {
               "include": "#interpolation"
@@ -1897,9 +1741,9 @@
           ]
         },
         {
+          "name": "string.quoted.other.backtick.sql",
           "begin": "`",
           "end": "`",
-          "name": "string.quoted.other.backtick.sql",
           "patterns": [
             {
               "include": "#interpolation"
@@ -1912,118 +1756,125 @@
         {
           "include": "source.sql"
         }
-      ]
-    },
-    "sql-string-single-quoted": {
-      "begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "contentName": "source.sql.embedded.php",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.php"
         }
-      },
+      }
+    },
+    "sql-string-single-quoted": {
       "name": "string.quoted.single.sql.php",
+      "contentName": "source.sql.embedded.php",
+      "begin": "'\\s*(?=(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER)\\b)",
+      "end": "'",
       "patterns": [
         {
-          "match": "#(\\\\'|[^'])*(?='|$\\n?)",
-          "name": "comment.line.number-sign.sql"
+          "name": "comment.line.number-sign.sql",
+          "match": "#(\\\\'|[^'])*(?='|$\\n?)"
         },
         {
-          "match": "--(\\\\'|[^'])*(?='|$\\n?)",
-          "name": "comment.line.double-dash.sql"
+          "name": "comment.line.double-dash.sql",
+          "match": "--(\\\\'|[^'])*(?='|$\\n?)"
         },
         {
-          "match": "\\\\[\\\\'`\"]",
-          "name": "constant.character.escape.php"
+          "name": "constant.character.escape.php",
+          "match": "\\\\[\\\\'`\"]"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\n\t\t\t\t\tSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
-          "match": "`(?=((\\\\`)|[^`'])*('|$))",
-          "name": "string.quoted.other.backtick.unclosed.sql"
+          "name": "string.quoted.other.backtick.unclosed.sql",
+          "match": "`(?=((\\\\`)|[^`'])*('|$))"
         },
         {
-          "comment": "Unclosed strings must be captured to avoid them eating the remainder of the PHP script\n\t\t\t\t\tSample case: $sql = \"SELECT * FROM bar WHERE foo = '\" . $variable . \"'\"",
-          "match": "\"(?=((\\\\\")|[^\"'])*('|$))",
-          "name": "string.quoted.double.unclosed.sql"
+          "name": "string.quoted.double.unclosed.sql",
+          "match": "\"(?=((\\\\\")|[^\"'])*('|$))"
         },
         {
           "include": "source.sql"
         }
-      ]
-    },
-    "string-backtick": {
-      "begin": "`",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "end": "`",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.php"
         }
-      },
+      }
+    },
+    "string-backtick": {
       "name": "string.interpolated.php",
+      "begin": "`",
+      "end": "`",
       "patterns": [
         {
-          "match": "\\\\.",
-          "name": "constant.character.escape.php"
+          "name": "constant.character.escape.php",
+          "match": "\\\\."
         },
         {
           "include": "#interpolation"
         }
-      ]
-    },
-    "string-double-quoted": {
-      "begin": "\"",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "comment": "This contentName is just to allow the usage of “select scope” to select the string contents first, then the string with quotes",
-      "contentName": "meta.string-contents.quoted.double.php",
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.php"
         }
-      },
+      }
+    },
+    "string-double-quoted": {
       "name": "string.quoted.double.php",
+      "contentName": "meta.string-contents.quoted.double.php",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
           "include": "#interpolation"
         }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
         }
       },
-      "contentName": "meta.string-contents.quoted.single.php",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.php"
         }
-      },
+      }
+    },
+    "string-single-quoted": {
       "name": "string.quoted.single.php",
+      "contentName": "meta.string-contents.quoted.single.php",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
-          "match": "\\\\[\\\\']",
-          "name": "constant.character.escape.php"
+          "name": "constant.character.escape.php",
+          "match": "\\\\[\\\\']"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.php"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.php"
+        }
+      }
     },
     "strings": {
       "patterns": [
@@ -2050,439 +1901,439 @@
     "support": {
       "patterns": [
         {
-          "match": "(?i)\\bapc_(s(tore|ma_info)|c(ompile_file|lear_cache|a(s|che_info))|inc|de(c|fine_constants|lete(_file)?)|exists|fetch|load_constants|add|bin_(dump(file)?|load(file)?))\\b",
-          "name": "support.function.apc.php"
+          "name": "support.function.apc.php",
+          "match": "(?i)\\bapc_(s(tore|ma_info)|c(ompile_file|lear_cache|a(s|che_info))|inc|de(c|fine_constants|lete(_file)?)|exists|fetch|load_constants|add|bin_(dump(file)?|load(file)?))\\b"
         },
         {
-          "match": "(?i)\\bapcu_(s(tore|ma_info)|c(lear_cache|a(s|che_info))|inc|de(c|lete)|e(ntry|xists)|fetch|add)\\b",
-          "name": "support.function.apcu.php"
+          "name": "support.function.apcu.php",
+          "match": "(?i)\\bapcu_(s(tore|ma_info)|c(lear_cache|a(s|che_info))|inc|de(c|lete)|e(ntry|xists)|fetch|add)\\b"
         },
         {
-          "match": "(?i)\\b(s(huffle|izeof|ort)|n(ext|at(sort|casesort))|c(o(unt|mpact)|urrent)|in_array|u(sort|ksort|asort)|p(os|rev)|e(nd|ach|xtract)|k(sort|ey(_exists)?|rsort)|list|a(sort|r(sort|ray(_(s(hift|um|plice|earch|lice)|c(h(unk|ange_key_case)|o(unt_values|lumn|mbine))|intersect(_(u(key|assoc)|key|assoc))?|diff(_(u(key|assoc)|key|assoc))?|u(n(shift|ique)|intersect(_(uassoc|assoc))?|diff(_(uassoc|assoc))?)|p(op|ush|ad|roduct)|values|key(s|_exists)|f(il(ter|l(_keys)?)|lip)|walk(_recursive)?|r(e(duce|place(_recursive)?|verse)|and)|m(ultisort|erge(_recursive)?|ap)))?))|r(sort|eset|ange))\\b",
-          "name": "support.function.array.php"
+          "name": "support.function.array.php",
+          "match": "(?i)\\b(s(huffle|izeof|ort)|n(ext|at(sort|casesort))|c(o(unt|mpact)|urrent)|in_array|u(sort|ksort|asort)|p(os|rev)|e(nd|ach|xtract)|k(sort|ey(_exists)?|rsort)|list|a(sort|r(sort|ray(_(s(hift|um|plice|earch|lice)|c(h(unk|ange_key_case)|o(unt_values|lumn|mbine))|intersect(_(u(key|assoc)|key|assoc))?|diff(_(u(key|assoc)|key|assoc))?|u(n(shift|ique)|intersect(_(uassoc|assoc))?|diff(_(uassoc|assoc))?)|p(op|ush|ad|roduct)|values|key(s|_exists)|f(il(ter|l(_keys)?)|lip)|walk(_recursive)?|r(e(duce|place(_recursive)?|verse)|and)|m(ultisort|erge(_recursive)?|ap)))?))|r(sort|eset|ange))\\b"
         },
         {
-          "match": "(?i)\\b(s(how_source|ys_getloadavg|leep)|highlight_(string|file)|con(stant|nection_(status|aborted))|time_(sleep_until|nanosleep)|ignore_user_abort|d(ie|efine(d)?)|u(sleep|n(iqid|pack))|__halt_compiler|p(hp_(strip_whitespace|check_syntax)|ack)|e(val|xit)|get_browser)\\b",
-          "name": "support.function.basic_functions.php"
+          "name": "support.function.basic_functions.php",
+          "match": "(?i)\\b(s(how_source|ys_getloadavg|leep)|highlight_(string|file)|con(stant|nection_(status|aborted))|time_(sleep_until|nanosleep)|ignore_user_abort|d(ie|efine(d)?)|u(sleep|n(iqid|pack))|__halt_compiler|p(hp_(strip_whitespace|check_syntax)|ack)|e(val|xit)|get_browser)\\b"
         },
         {
-          "match": "(?i)\\bbc(s(cale|ub|qrt)|comp|div|pow(mod)?|add|m(od|ul))\\b",
-          "name": "support.function.bcmath.php"
+          "name": "support.function.bcmath.php",
+          "match": "(?i)\\bbc(s(cale|ub|qrt)|comp|div|pow(mod)?|add|m(od|ul))\\b"
         },
         {
-          "match": "(?i)\\bblenc_encrypt\\b",
-          "name": "support.function.blenc.php"
+          "name": "support.function.blenc.php",
+          "match": "(?i)\\bblenc_encrypt\\b"
         },
         {
-          "match": "(?i)\\bMongoDB\\\\BSON\\\\(to(JSON|PHP)|from(JSON|PHP))\\b",
-          "name": "support.function.bson.php"
+          "name": "support.function.bson.php",
+          "match": "(?i)\\bMongoDB\\\\BSON\\\\(to(JSON|PHP)|from(JSON|PHP))\\b"
         },
         {
-          "match": "(?i)\\bbz(c(ompress|lose)|open|decompress|err(str|no|or)|flush|write|read)\\b",
-          "name": "support.function.bz2.php"
+          "name": "support.function.bz2.php",
+          "match": "(?i)\\bbz(c(ompress|lose)|open|decompress|err(str|no|or)|flush|write|read)\\b"
         },
         {
-          "match": "(?i)\\b(cal_(to_jd|info|days_in_month|from_jd)|unixtojd|j(d(to(unix|j(ulian|ewish)|french|gregorian)|dayofweek|monthname)|uliantojd|ewishtojd)|easter_da(ys|te)|frenchtojd|gregoriantojd)\\b",
-          "name": "support.function.calendar.php"
+          "name": "support.function.calendar.php",
+          "match": "(?i)\\b(cal_(to_jd|info|days_in_month|from_jd)|unixtojd|j(d(to(unix|j(ulian|ewish)|french|gregorian)|dayofweek|monthname)|uliantojd|ewishtojd)|easter_da(ys|te)|frenchtojd|gregoriantojd)\\b"
         },
         {
-          "match": "(?i)\\b(c(lass_(exists|alias)|all_user_method(_array)?)|trait_exists|i(s_(subclass_of|a)|nterface_exists)|__autoload|property_exists|get_(c(lass(_(vars|methods))?|alled_class)|object_vars|declared_(classes|traits|interfaces)|parent_class)|method_exists)\\b",
-          "name": "support.function.classobj.php"
+          "name": "support.function.classobj.php",
+          "match": "(?i)\\b(c(lass_(exists|alias)|all_user_method(_array)?)|trait_exists|i(s_(subclass_of|a)|nterface_exists)|__autoload|property_exists|get_(c(lass(_(vars|methods))?|alled_class)|object_vars|declared_(classes|traits|interfaces)|parent_class)|method_exists)\\b"
         },
         {
-          "match": "(?i)\\b(com_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)|variant_(s(ub|et(_type)?)|n(ot|eg)|c(a(st|t)|mp)|i(nt|div|mp)|or|d(iv|ate_(to_timestamp|from_timestamp))|pow|eqv|fix|a(nd|dd|bs)|round|get_type|xor|m(od|ul)))\\b",
-          "name": "support.function.com.php"
+          "name": "support.function.com.php",
+          "match": "(?i)\\b(com_(create_guid|print_typeinfo|event_sink|load_typelib|get_active_object|message_pump)|variant_(s(ub|et(_type)?)|n(ot|eg)|c(a(st|t)|mp)|i(nt|div|mp)|or|d(iv|ate_(to_timestamp|from_timestamp))|pow|eqv|fix|a(nd|dd|bs)|round|get_type|xor|m(od|ul)))\\b"
         },
         {
-          "match": "(?i)\\brandom_(int|bytes)\\b",
-          "name": "support.function.csprng.php"
+          "name": "support.function.csprng.php",
+          "match": "(?i)\\brandom_(int|bytes)\\b"
         },
         {
-          "match": "(?i)\\bctype_(space|cntrl|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit)\\b",
-          "name": "support.function.ctype.php"
+          "name": "support.function.ctype.php",
+          "match": "(?i)\\bctype_(space|cntrl|digit|upper|p(unct|rint)|lower|al(num|pha)|graph|xdigit)\\b"
         },
         {
-          "match": "(?i)\\bcurl_(s(hare_(setopt|close|init)|trerror|etopt(_array)?)|c(opy_handle|lose)|init|unescape|pause|e(scape|rr(no|or)|xec)|version|file_create|reset|getinfo|multi_(s(trerror|e(topt|lect))|close|in(it|fo_read)|exec|add_handle|remove_handle|getcontent))\\b",
-          "name": "support.function.curl.php"
+          "name": "support.function.curl.php",
+          "match": "(?i)\\bcurl_(s(hare_(setopt|close|init)|trerror|etopt(_array)?)|c(opy_handle|lose)|init|unescape|pause|e(scape|rr(no|or)|xec)|version|file_create|reset|getinfo|multi_(s(trerror|e(topt|lect))|close|in(it|fo_read)|exec|add_handle|remove_handle|getcontent))\\b"
         },
         {
-          "match": "(?i)\\b(str(totime|ptime|ftime)|checkdate|time(zone_(name_(from_abbr|get)|transitions_get|identifiers_list|o(pen|ffset_get)|version_get|location_get|abbreviations_list))?|idate|date(_(su(n(set|_info|rise)|b)|create(_(immutable(_from_format)?|from_format))?|time(stamp_(set|get)|zone_(set|get)|_set)|i(sodate_set|nterval_(create_from_date_string|format))|offset_get|d(iff|efault_timezone_(set|get)|ate_set)|parse(_from_format)?|format|add|get_last_errors|modify))?|localtime|g(et(timeofday|date)|m(strftime|date|mktime))|m(icrotime|ktime))\\b",
-          "name": "support.function.datetime.php"
+          "name": "support.function.datetime.php",
+          "match": "(?i)\\b(str(totime|ptime|ftime)|checkdate|time(zone_(name_(from_abbr|get)|transitions_get|identifiers_list|o(pen|ffset_get)|version_get|location_get|abbreviations_list))?|idate|date(_(su(n(set|_info|rise)|b)|create(_(immutable(_from_format)?|from_format))?|time(stamp_(set|get)|zone_(set|get)|_set)|i(sodate_set|nterval_(create_from_date_string|format))|offset_get|d(iff|efault_timezone_(set|get)|ate_set)|parse(_from_format)?|format|add|get_last_errors|modify))?|localtime|g(et(timeofday|date)|m(strftime|date|mktime))|m(icrotime|ktime))\\b"
         },
         {
-          "match": "(?i)\\bdba_(sync|handlers|nextkey|close|insert|op(timize|en)|delete|popen|exists|key_split|f(irstkey|etch)|list|replace)\\b",
-          "name": "support.function.dba.php"
+          "name": "support.function.dba.php",
+          "match": "(?i)\\bdba_(sync|handlers|nextkey|close|insert|op(timize|en)|delete|popen|exists|key_split|f(irstkey|etch)|list|replace)\\b"
         },
         {
-          "match": "(?i)\\bdbx_(sort|c(o(nnect|mpare)|lose)|e(scape_string|rror)|query|fetch_row)\\b",
-          "name": "support.function.dbx.php"
+          "name": "support.function.dbx.php",
+          "match": "(?i)\\bdbx_(sort|c(o(nnect|mpare)|lose)|e(scape_string|rror)|query|fetch_row)\\b"
         },
         {
-          "match": "(?i)\\b(scandir|c(h(dir|root)|losedir)|opendir|dir|re(winddir|addir)|getcwd)\\b",
-          "name": "support.function.dir.php"
+          "name": "support.function.dir.php",
+          "match": "(?i)\\b(scandir|c(h(dir|root)|losedir)|opendir|dir|re(winddir|addir)|getcwd)\\b"
         },
         {
-          "match": "(?i)\\beio_(s(y(nc(_file_range|fs)?|mlink)|tat(vfs)?|e(ndfile|t_m(in_parallel|ax_(idle|p(oll_(time|reqs)|arallel)))|ek))|n(threads|op|pending|re(qs|ady))|c(h(own|mod)|ustom|lose|ancel)|truncate|init|open|dup2|u(nlink|time)|poll|event_loop|f(s(ync|tat(vfs)?)|ch(own|mod)|truncate|datasync|utime|allocate)|write|l(stat|ink)|r(e(name|a(d(dir|link|ahead)?|lpath))|mdir)|g(et_(event_stream|last_error)|rp(_(cancel|limit|add))?)|mk(nod|dir)|busy)\\b",
-          "name": "support.function.eio.php"
+          "name": "support.function.eio.php",
+          "match": "(?i)\\beio_(s(y(nc(_file_range|fs)?|mlink)|tat(vfs)?|e(ndfile|t_m(in_parallel|ax_(idle|p(oll_(time|reqs)|arallel)))|ek))|n(threads|op|pending|re(qs|ady))|c(h(own|mod)|ustom|lose|ancel)|truncate|init|open|dup2|u(nlink|time)|poll|event_loop|f(s(ync|tat(vfs)?)|ch(own|mod)|truncate|datasync|utime|allocate)|write|l(stat|ink)|r(e(name|a(d(dir|link|ahead)?|lpath))|mdir)|g(et_(event_stream|last_error)|rp(_(cancel|limit|add))?)|mk(nod|dir)|busy)\\b"
         },
         {
-          "match": "(?i)\\benchant_(dict_(s(tore_replacement|uggest)|check|is_in_session|describe|quick_check|add_to_(session|personal)|get_error)|broker_(set_(ordering|dict_path)|init|d(ict_exists|escribe)|free(_dict)?|list_dicts|request_(dict|pwl_dict)|get_(dict_path|error)))\\b",
-          "name": "support.function.enchant.php"
+          "name": "support.function.enchant.php",
+          "match": "(?i)\\benchant_(dict_(s(tore_replacement|uggest)|check|is_in_session|describe|quick_check|add_to_(session|personal)|get_error)|broker_(set_(ordering|dict_path)|init|d(ict_exists|escribe)|free(_dict)?|list_dicts|request_(dict|pwl_dict)|get_(dict_path|error)))\\b"
         },
         {
-          "match": "(?i)\\b(s(plit(i)?|ql_regcase)|ereg(i(_replace)?|_replace)?)\\b",
-          "name": "support.function.ereg.php"
+          "name": "support.function.ereg.php",
+          "match": "(?i)\\b(s(plit(i)?|ql_regcase)|ereg(i(_replace)?|_replace)?)\\b"
         },
         {
-          "match": "(?i)\\b(set_e(rror_handler|xception_handler)|trigger_error|debug_(print_backtrace|backtrace)|user_error|error_(clear_last|log|reporting|get_last)|restore_e(rror_handler|xception_handler))\\b",
-          "name": "support.function.errorfunc.php"
+          "name": "support.function.errorfunc.php",
+          "match": "(?i)\\b(set_e(rror_handler|xception_handler)|trigger_error|debug_(print_backtrace|backtrace)|user_error|error_(clear_last|log|reporting|get_last)|restore_e(rror_handler|xception_handler))\\b"
         },
         {
-          "match": "(?i)\\b(s(hell_exec|ystem)|p(assthru|roc_(nice|close|terminate|open|get_status))|e(scapeshell(cmd|arg)|xec))\\b",
-          "name": "support.function.exec.php"
+          "name": "support.function.exec.php",
+          "match": "(?i)\\b(s(hell_exec|ystem)|p(assthru|roc_(nice|close|terminate|open|get_status))|e(scapeshell(cmd|arg)|xec))\\b"
         },
         {
-          "match": "(?i)\\b(exif_(t(humbnail|agname)|imagetype|read_data)|read_exif_data)\\b",
-          "name": "support.function.exif.php"
+          "name": "support.function.exif.php",
+          "match": "(?i)\\b(exif_(t(humbnail|agname)|imagetype|read_data)|read_exif_data)\\b"
         },
         {
-          "match": "(?i)\\bfann_(s(huffle_train_data|cale_(train(_data)?|input(_train_data)?|output(_train_data)?)|ubset_train_data|et_(s(caling_params|arprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift))|ca(scade_(num_candidate_groups|candidate_(stagnation_epochs|change_fraction|limit)|output_(stagnation_epochs|change_fraction)|weight_multiplier|activation_(steepnesses|functions)|m(in_(cand_epochs|out_epochs)|ax_(cand_epochs|out_epochs)))|llback)|train(ing_algorithm|_(stop_function|error_function))|input_scaling_params|output_scaling_params|error_log|quickprop_(decay|mu)|weight(_array)?|learning_(rate|momentum)|activation_(steepness(_(hidden|output|layer))?|function(_(hidden|output|layer))?)|rprop_(increase_factor|de(crease_factor|lta_(zero|m(in|ax))))|bit_fail_limit)|ave(_train)?)|num_(input_train_data|output_train_data)|c(opy|lear_scaling_params|ascadetrain_on_(data|file)|reate_(s(hortcut(_array)?|tandard(_array)?|parse(_array)?)|train(_from_callback)?|from_file))|t(est(_data)?|rain(_(on_(data|file)|epoch))?)|init_weights|d(uplicate_train_data|es(cale_(train|input|output)|troy(_train)?))|print_error|length_train_data|r(un|e(set_(MSE|err(str|no))|ad_train_from_file)|andomize_weights)|get_(sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|n(um_(input|output|layers)|etwork_type)|MSE|c(onnection_(array|rate)|ascade_(num_candidate(s|_groups)|candidate_(stagnation_epochs|change_fraction|limit)|output_(stagnation_epochs|change_fraction)|weight_multiplier|activation_(steepnesses(_count)?|functions(_count)?)|m(in_(cand_epochs|out_epochs)|ax_(cand_epochs|out_epochs))))|t(otal_(neurons|connections)|rain(ing_algorithm|_(stop_function|error_function)))|err(str|no)|quickprop_(decay|mu)|l(earning_(rate|momentum)|ayer_array)|activation_(steepness|function)|rprop_(increase_factor|de(crease_factor|lta_(zero|m(in|ax))))|bi(t_fail(_limit)?|as_array))|merge_train_data)\\b",
-          "name": "support.function.fann.php"
+          "name": "support.function.fann.php",
+          "match": "(?i)\\bfann_(s(huffle_train_data|cale_(train(_data)?|input(_train_data)?|output(_train_data)?)|ubset_train_data|et_(s(caling_params|arprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift))|ca(scade_(num_candidate_groups|candidate_(stagnation_epochs|change_fraction|limit)|output_(stagnation_epochs|change_fraction)|weight_multiplier|activation_(steepnesses|functions)|m(in_(cand_epochs|out_epochs)|ax_(cand_epochs|out_epochs)))|llback)|train(ing_algorithm|_(stop_function|error_function))|input_scaling_params|output_scaling_params|error_log|quickprop_(decay|mu)|weight(_array)?|learning_(rate|momentum)|activation_(steepness(_(hidden|output|layer))?|function(_(hidden|output|layer))?)|rprop_(increase_factor|de(crease_factor|lta_(zero|m(in|ax))))|bit_fail_limit)|ave(_train)?)|num_(input_train_data|output_train_data)|c(opy|lear_scaling_params|ascadetrain_on_(data|file)|reate_(s(hortcut(_array)?|tandard(_array)?|parse(_array)?)|train(_from_callback)?|from_file))|t(est(_data)?|rain(_(on_(data|file)|epoch))?)|init_weights|d(uplicate_train_data|es(cale_(train|input|output)|troy(_train)?))|print_error|length_train_data|r(un|e(set_(MSE|err(str|no))|ad_train_from_file)|andomize_weights)|get_(sarprop_(step_error_(shift|threshold_factor)|temperature|weight_decay_shift)|n(um_(input|output|layers)|etwork_type)|MSE|c(onnection_(array|rate)|ascade_(num_candidate(s|_groups)|candidate_(stagnation_epochs|change_fraction|limit)|output_(stagnation_epochs|change_fraction)|weight_multiplier|activation_(steepnesses(_count)?|functions(_count)?)|m(in_(cand_epochs|out_epochs)|ax_(cand_epochs|out_epochs))))|t(otal_(neurons|connections)|rain(ing_algorithm|_(stop_function|error_function)))|err(str|no)|quickprop_(decay|mu)|l(earning_(rate|momentum)|ayer_array)|activation_(steepness|function)|rprop_(increase_factor|de(crease_factor|lta_(zero|m(in|ax))))|bi(t_fail(_limit)?|as_array))|merge_train_data)\\b"
         },
         {
-          "match": "(?i)\\b(s(ymlink|tat|et_file_buffer)|c(h(own|grp|mod)|opy|learstatcache)|t(ouch|empnam|mpfile)|is_(dir|uploaded_file|executable|file|writ(eable|able)|link|readable)|d(i(sk(_(total_space|free_space)|freespace)|rname)|elete)|u(nlink|mask)|p(close|open|a(thinfo|rse_ini_(string|file)))|f(s(canf|tat|eek)|nmatch|close|t(ell|runcate)|ile(size|ctime|type|inode|owner|_(put_contents|exists|get_contents)|perms|atime|group|mtime)?|open|p(ut(s|csv)|assthru)|eof|flush|write|lock|read|get(s(s)?|c(sv)?))|l(stat|ch(own|grp)|ink(info)?)|r(e(name|wind|a(d(file|link)|lpath(_cache_(size|get))?))|mdir)|glob|m(ove_uploaded_file|kdir)|basename)\\b",
-          "name": "support.function.file.php"
+          "name": "support.function.file.php",
+          "match": "(?i)\\b(s(ymlink|tat|et_file_buffer)|c(h(own|grp|mod)|opy|learstatcache)|t(ouch|empnam|mpfile)|is_(dir|uploaded_file|executable|file|writ(eable|able)|link|readable)|d(i(sk(_(total_space|free_space)|freespace)|rname)|elete)|u(nlink|mask)|p(close|open|a(thinfo|rse_ini_(string|file)))|f(s(canf|tat|eek)|nmatch|close|t(ell|runcate)|ile(size|ctime|type|inode|owner|_(put_contents|exists|get_contents)|perms|atime|group|mtime)?|open|p(ut(s|csv)|assthru)|eof|flush|write|lock|read|get(s(s)?|c(sv)?))|l(stat|ch(own|grp)|ink(info)?)|r(e(name|wind|a(d(file|link)|lpath(_cache_(size|get))?))|mdir)|glob|m(ove_uploaded_file|kdir)|basename)\\b"
         },
         {
-          "match": "(?i)\\b(finfo_(set_flags|close|open|file|buffer)|mime_content_type)\\b",
-          "name": "support.function.fileinfo.php"
+          "name": "support.function.fileinfo.php",
+          "match": "(?i)\\b(finfo_(set_flags|close|open|file|buffer)|mime_content_type)\\b"
         },
         {
-          "match": "(?i)\\bfilter_(has_var|i(nput(_array)?|d)|var(_array)?|list)\\b",
-          "name": "support.function.filter.php"
+          "name": "support.function.filter.php",
+          "match": "(?i)\\bfilter_(has_var|i(nput(_array)?|d)|var(_array)?|list)\\b"
         },
         {
-          "match": "(?i)\\bfastcgi_finish_request\\b",
-          "name": "support.function.fpm.php"
+          "name": "support.function.fpm.php",
+          "match": "(?i)\\bfastcgi_finish_request\\b"
         },
         {
-          "match": "(?i)\\b(c(all_user_func(_array)?|reate_function)|unregister_tick_function|f(orward_static_call(_array)?|unc(tion_exists|_(num_args|get_arg(s)?)))|register_(shutdown_function|tick_function)|get_defined_functions)\\b",
-          "name": "support.function.funchand.php"
+          "name": "support.function.funchand.php",
+          "match": "(?i)\\b(c(all_user_func(_array)?|reate_function)|unregister_tick_function|f(orward_static_call(_array)?|unc(tion_exists|_(num_args|get_arg(s)?)))|register_(shutdown_function|tick_function)|get_defined_functions)\\b"
         },
         {
-          "match": "(?i)\\b(ngettext|textdomain|d(ngettext|c(ngettext|gettext)|gettext)|gettext|bind(textdomain|_textdomain_codeset))\\b",
-          "name": "support.function.gettext.php"
+          "name": "support.function.gettext.php",
+          "match": "(?i)\\b(ngettext|textdomain|d(ngettext|c(ngettext|gettext)|gettext)|gettext|bind(textdomain|_textdomain_codeset))\\b"
         },
         {
-          "match": "(?i)\\bgmp_(s(can(1|0)|trval|ign|ub|etbit|qrt(rem)?)|hamdist|ne(g|xtprime)|c(om|lrbit|mp)|testbit|i(n(tval|it|vert)|mport)|or|div(_(q(r)?|r)|exact)?|jacobi|p(o(pcount|w(m)?)|erfect_square|rob_prime)|export|fact|legendre|a(nd|dd|bs)|r(oot(rem)?|andom(_(seed|range|bits))?)|gcd(ext)?|xor|m(od|ul))\\b",
-          "name": "support.function.gmp.php"
+          "name": "support.function.gmp.php",
+          "match": "(?i)\\bgmp_(s(can(1|0)|trval|ign|ub|etbit|qrt(rem)?)|hamdist|ne(g|xtprime)|c(om|lrbit|mp)|testbit|i(n(tval|it|vert)|mport)|or|div(_(q(r)?|r)|exact)?|jacobi|p(o(pcount|w(m)?)|erfect_square|rob_prime)|export|fact|legendre|a(nd|dd|bs)|r(oot(rem)?|andom(_(seed|range|bits))?)|gcd(ext)?|xor|m(od|ul))\\b"
         },
         {
-          "match": "(?i)\\bhash(_(h(kdf|mac(_file)?)|copy|init|update(_(stream|file))?|pbkdf2|equals|fi(nal|le)|algos))?\\b",
-          "name": "support.function.hash.php"
+          "name": "support.function.hash.php",
+          "match": "(?i)\\bhash(_(h(kdf|mac(_file)?)|copy|init|update(_(stream|file))?|pbkdf2|equals|fi(nal|le)|algos))?\\b"
         },
         {
-          "match": "(?i)\\b(iconv(_(s(tr(pos|len|rpos)|ubstr|et_encoding)|get_encoding|mime_(decode(_headers)?|encode)))?|ob_iconv_handler)\\b",
-          "name": "support.function.iconv.php"
+          "name": "support.function.iconv.php",
+          "match": "(?i)\\b(iconv(_(s(tr(pos|len|rpos)|ubstr|et_encoding)|get_encoding|mime_(decode(_headers)?|encode)))?|ob_iconv_handler)\\b"
         },
         {
-          "match": "(?i)\\biis_(s(t(op_serv(ice|er)|art_serv(ice|er))|et_(s(cript_map|erver_rights)|dir_security|app_settings))|add_server|remove_server|get_(s(cript_map|erv(ice_state|er_(rights|by_(comment|path))))|dir_security))\\b",
-          "name": "support.function.iisfunc.php"
+          "name": "support.function.iisfunc.php",
+          "match": "(?i)\\biis_(s(t(op_serv(ice|er)|art_serv(ice|er))|et_(s(cript_map|erver_rights)|dir_security|app_settings))|add_server|remove_server|get_(s(cript_map|erv(ice_state|er_(rights|by_(comment|path))))|dir_security))\\b"
         },
         {
-          "match": "(?i)\\b(i(ptc(parse|embed)|mage(s(y|cale|tring(up)?|et(style|clip|t(hickness|ile)|interpolation|pixel|brush)|avealpha|x)|c(har(up)?|o(nvolution|py(res(ized|ampled)|merge(gray)?)?|lor(s(total|et|forindex)|closest(hwb|alpha)?|transparent|deallocate|exact(alpha)?|a(t|llocate(alpha)?)|resolve(alpha)?|match))|r(op(auto)?|eate(truecolor|from(string|jpeg|png|w(ebp|bmp)|g(if|d(2(part)?)?)|x(pm|bm)|bmp))?))|t(ypes|tf(text|bbox)|ruecolortopalette)|i(struecolor|nterlace)|2wbmp|openpolygon|d(estroy|ashedline)|jpeg|_type_to_(extension|mime_type)|p(s(slantfont|text|e(ncodefont|xtendfont)|freefont|loadfont|bbox)|ng|olygon|alette(copy|totruecolor))|ellipse|f(t(text|bbox)|il(ter|l(toborder|ed(polygon|ellipse|arc|rectangle))?)|ont(height|width)|lip)|w(ebp|bmp)|l(ine|oadfont|ayereffect)|a(ntialias|ffine(matrix(concat|get))?|lphablending|rc)|r(otate|e(solution|ctangle))|g(if|d(2)?|etclip|ammacorrect|rab(screen|window))|xbm|bmp))|jpeg2wbmp|png2wbmp|g(d_info|etimagesize(fromstring)?))\\b",
-          "name": "support.function.image.php"
+          "name": "support.function.image.php",
+          "match": "(?i)\\b(i(ptc(parse|embed)|mage(s(y|cale|tring(up)?|et(style|clip|t(hickness|ile)|interpolation|pixel|brush)|avealpha|x)|c(har(up)?|o(nvolution|py(res(ized|ampled)|merge(gray)?)?|lor(s(total|et|forindex)|closest(hwb|alpha)?|transparent|deallocate|exact(alpha)?|a(t|llocate(alpha)?)|resolve(alpha)?|match))|r(op(auto)?|eate(truecolor|from(string|jpeg|png|w(ebp|bmp)|g(if|d(2(part)?)?)|x(pm|bm)|bmp))?))|t(ypes|tf(text|bbox)|ruecolortopalette)|i(struecolor|nterlace)|2wbmp|openpolygon|d(estroy|ashedline)|jpeg|_type_to_(extension|mime_type)|p(s(slantfont|text|e(ncodefont|xtendfont)|freefont|loadfont|bbox)|ng|olygon|alette(copy|totruecolor))|ellipse|f(t(text|bbox)|il(ter|l(toborder|ed(polygon|ellipse|arc|rectangle))?)|ont(height|width)|lip)|w(ebp|bmp)|l(ine|oadfont|ayereffect)|a(ntialias|ffine(matrix(concat|get))?|lphablending|rc)|r(otate|e(solution|ctangle))|g(if|d(2)?|etclip|ammacorrect|rab(screen|window))|xbm|bmp))|jpeg2wbmp|png2wbmp|g(d_info|etimagesize(fromstring)?))\\b"
         },
         {
-          "match": "(?i)\\b(s(ys_get_temp_dir|et_(time_limit|include_path|magic_quotes_runtime))|cli_(set_process_title|get_process_title)|ini_(set|alter|restore|get(_all)?)|zend_(thread_id|version|logo_guid)|dl|p(hp(credits|info|_(sapi_name|ini_(scanned_files|loaded_file)|uname|logo_guid)|version)|utenv)|extension_loaded|version_compare|assert(_options)?|restore_include_path|g(c_(collect_cycles|disable|enable(d)?|mem_caches)|et(opt|_(c(urrent_user|fg_var)|include(d_files|_path)|defined_constants|extension_funcs|loaded_extensions|re(sources|quired_files)|magic_quotes_(runtime|gpc))|env|lastmod|rusage|my(inode|uid|pid|gid)))|m(emory_get_(usage|peak_usage)|a(in|gic_quotes_runtime)))\\b",
-          "name": "support.function.info.php"
+          "name": "support.function.info.php",
+          "match": "(?i)\\b(s(ys_get_temp_dir|et_(time_limit|include_path|magic_quotes_runtime))|cli_(set_process_title|get_process_title)|ini_(set|alter|restore|get(_all)?)|zend_(thread_id|version|logo_guid)|dl|p(hp(credits|info|_(sapi_name|ini_(scanned_files|loaded_file)|uname|logo_guid)|version)|utenv)|extension_loaded|version_compare|assert(_options)?|restore_include_path|g(c_(collect_cycles|disable|enable(d)?|mem_caches)|et(opt|_(c(urrent_user|fg_var)|include(d_files|_path)|defined_constants|extension_funcs|loaded_extensions|re(sources|quired_files)|magic_quotes_(runtime|gpc))|env|lastmod|rusage|my(inode|uid|pid|gid)))|m(emory_get_(usage|peak_usage)|a(in|gic_quotes_runtime)))\\b"
         },
         {
-          "match": "(?i)\\bibase_(se(t_event_handler|rv(ice_(detach|attach)|er_info))|n(um_(params|fields)|ame_result)|c(o(nnect|mmit(_ret)?)|lose)|trans|d(elete_user|rop_db|b_info)|p(connect|aram_info|repare)|e(rr(code|msg)|xecute)|query|f(ield_info|etch_(object|assoc|row)|ree_(event_handler|query|result))|wait_event|a(dd_user|ffected_rows)|r(ollback(_ret)?|estore)|gen_id|m(odify_user|aintain_db)|b(lob_(c(lose|ancel|reate)|i(nfo|mport)|open|echo|add|get)|ackup))\\b",
-          "name": "support.function.interbase.php"
+          "name": "support.function.interbase.php",
+          "match": "(?i)\\bibase_(se(t_event_handler|rv(ice_(detach|attach)|er_info))|n(um_(params|fields)|ame_result)|c(o(nnect|mmit(_ret)?)|lose)|trans|d(elete_user|rop_db|b_info)|p(connect|aram_info|repare)|e(rr(code|msg)|xecute)|query|f(ield_info|etch_(object|assoc|row)|ree_(event_handler|query|result))|wait_event|a(dd_user|ffected_rows)|r(ollback(_ret)?|estore)|gen_id|m(odify_user|aintain_db)|b(lob_(c(lose|ancel|reate)|i(nfo|mport)|open|echo|add|get)|ackup))\\b"
         },
         {
-          "match": "(?i)\\b(n(ormalizer_(normalize|is_normalized)|umfmt_(set_(symbol|text_attribute|pattern|attribute)|create|parse(_currency)?|format(_currency)?|get_(symbol|text_attribute|pattern|error_(code|message)|locale|attribute)))|collator_(s(ort(_with_sort_keys)?|et_(strength|attribute))|c(ompare|reate)|asort|get_(s(trength|ort_key)|error_(code|message)|locale|attribute))|transliterator_(create(_(inverse|from_rules))?|transliterate|list_ids|get_error_(code|message))|i(ntl(cal_get_error_(code|message)|tz_get_error_(code|message)|_(is_failure|error_name|get_error_(code|message)))|dn_to_(utf8|ascii))|datefmt_(set_(calendar|timezone(_id)?|pattern|lenient)|create|is_lenient|parse|format(_object)?|localtime|get_(calendar(_object)?|time(type|zone(_id)?)|datetype|pattern|error_(code|message)|locale))|locale_(set_default|c(ompose|anonicalize)|parse|filter_matches|lookup|accept_from_http|get_(script|d(isplay_(script|name|variant|language|region)|efault)|primary_language|keywords|all_variants|region))|resourcebundle_(c(ount|reate)|locales|get(_error_(code|message))?)|grapheme_(s(tr(str|i(str|pos)|pos|len|r(ipos|pos))|ubstr)|extract)|msgfmt_(set_pattern|create|parse(_message)?|format(_message)?|get_(pattern|error_(code|message)|locale)))\\b",
-          "name": "support.function.intl.php"
+          "name": "support.function.intl.php",
+          "match": "(?i)\\b(n(ormalizer_(normalize|is_normalized)|umfmt_(set_(symbol|text_attribute|pattern|attribute)|create|parse(_currency)?|format(_currency)?|get_(symbol|text_attribute|pattern|error_(code|message)|locale|attribute)))|collator_(s(ort(_with_sort_keys)?|et_(strength|attribute))|c(ompare|reate)|asort|get_(s(trength|ort_key)|error_(code|message)|locale|attribute))|transliterator_(create(_(inverse|from_rules))?|transliterate|list_ids|get_error_(code|message))|i(ntl(cal_get_error_(code|message)|tz_get_error_(code|message)|_(is_failure|error_name|get_error_(code|message)))|dn_to_(utf8|ascii))|datefmt_(set_(calendar|timezone(_id)?|pattern|lenient)|create|is_lenient|parse|format(_object)?|localtime|get_(calendar(_object)?|time(type|zone(_id)?)|datetype|pattern|error_(code|message)|locale))|locale_(set_default|c(ompose|anonicalize)|parse|filter_matches|lookup|accept_from_http|get_(script|d(isplay_(script|name|variant|language|region)|efault)|primary_language|keywords|all_variants|region))|resourcebundle_(c(ount|reate)|locales|get(_error_(code|message))?)|grapheme_(s(tr(str|i(str|pos)|pos|len|r(ipos|pos))|ubstr)|extract)|msgfmt_(set_pattern|create|parse(_message)?|format(_message)?|get_(pattern|error_(code|message)|locale)))\\b"
         },
         {
-          "match": "(?i)\\bjson_(decode|encode|last_error(_msg)?)\\b",
-          "name": "support.function.json.php"
+          "name": "support.function.json.php",
+          "match": "(?i)\\bjson_(decode|encode|last_error(_msg)?)\\b"
         },
         {
-          "match": "(?i)\\bldap_(s(tart_tls|ort|e(t_(option|rebind_proc)|arch)|asl_bind)|next_(entry|attribute|reference)|c(o(n(nect|trol_paged_result(_response)?)|unt_entries|mpare)|lose)|t61_to_8859|d(n2ufn|elete)|8859_to_t61|unbind|parse_re(sult|ference)|e(scape|rr(no|2str|or)|xplode_dn)|f(irst_(entry|attribute|reference)|ree_result)|list|add|re(name|ad)|get_(option|dn|entries|values(_len)?|attributes)|mod(ify(_batch)?|_(del|add|replace))|bind)\\b",
-          "name": "support.function.ldap.php"
+          "name": "support.function.ldap.php",
+          "match": "(?i)\\bldap_(s(tart_tls|ort|e(t_(option|rebind_proc)|arch)|asl_bind)|next_(entry|attribute|reference)|c(o(n(nect|trol_paged_result(_response)?)|unt_entries|mpare)|lose)|t61_to_8859|d(n2ufn|elete)|8859_to_t61|unbind|parse_re(sult|ference)|e(scape|rr(no|2str|or)|xplode_dn)|f(irst_(entry|attribute|reference)|ree_result)|list|add|re(name|ad)|get_(option|dn|entries|values(_len)?|attributes)|mod(ify(_batch)?|_(del|add|replace))|bind)\\b"
         },
         {
-          "match": "(?i)\\blibxml_(set_(streams_context|external_entity_loader)|clear_errors|disable_entity_loader|use_internal_errors|get_(errors|last_error))\\b",
-          "name": "support.function.libxml.php"
+          "name": "support.function.libxml.php",
+          "match": "(?i)\\blibxml_(set_(streams_context|external_entity_loader)|clear_errors|disable_entity_loader|use_internal_errors|get_(errors|last_error))\\b"
         },
         {
-          "match": "(?i)\\b(ezmlm_hash|mail)\\b",
-          "name": "support.function.mail.php"
+          "name": "support.function.mail.php",
+          "match": "(?i)\\b(ezmlm_hash|mail)\\b"
         },
         {
-          "match": "(?i)\\b(s(in(h)?|qrt|rand)|h(ypot|exdec)|c(os(h)?|eil)|tan(h)?|i(s_(nan|infinite|finite)|ntdiv)|octdec|de(c(hex|oct|bin)|g2rad)|p(i|ow)|exp(m1)?|f(loor|mod)|l(cg_value|og(1(p|0))?)|a(sin(h)?|cos(h)?|tan(h|2)?|bs)|r(ound|a(nd|d2deg))|getrandmax|m(t_(srand|rand|getrandmax)|in|ax)|b(indec|ase_convert))\\b",
-          "name": "support.function.math.php"
+          "name": "support.function.math.php",
+          "match": "(?i)\\b(s(in(h)?|qrt|rand)|h(ypot|exdec)|c(os(h)?|eil)|tan(h)?|i(s_(nan|infinite|finite)|ntdiv)|octdec|de(c(hex|oct|bin)|g2rad)|p(i|ow)|exp(m1)?|f(loor|mod)|l(cg_value|og(1(p|0))?)|a(sin(h)?|cos(h)?|tan(h|2)?|bs)|r(ound|a(nd|d2deg))|getrandmax|m(t_(srand|rand|getrandmax)|in|ax)|b(indec|ase_convert))\\b"
         },
         {
-          "match": "(?i)\\bmb_(s(tr(str|cut|to(upper|lower)|i(str|pos|mwidth)|pos|width|len|r(chr|i(chr|pos)|pos))|ubst(itute_character|r(_count)?)|plit|end_mail)|http_(input|output)|c(heck_encoding|onvert_(case|encoding|variables|kana))|internal_encoding|output_handler|de(code_(numericentity|mimeheader)|tect_(order|encoding))|p(arse_str|referred_mime_name)|e(ncod(ing_aliases|e_(numericentity|mimeheader))|reg(i(_replace)?|_(search(_(setpos|init|pos|regs|get(pos|regs)))?|replace(_callback)?|match))?)|l(ist_encodings|anguage)|regex_(set_options|encoding)|get_info)\\b",
-          "name": "support.function.mbstring.php"
+          "name": "support.function.mbstring.php",
+          "match": "(?i)\\bmb_(s(tr(str|cut|to(upper|lower)|i(str|pos|mwidth)|pos|width|len|r(chr|i(chr|pos)|pos))|ubst(itute_character|r(_count)?)|plit|end_mail)|http_(input|output)|c(heck_encoding|onvert_(case|encoding|variables|kana))|internal_encoding|output_handler|de(code_(numericentity|mimeheader)|tect_(order|encoding))|p(arse_str|referred_mime_name)|e(ncod(ing_aliases|e_(numericentity|mimeheader))|reg(i(_replace)?|_(search(_(setpos|init|pos|regs|get(pos|regs)))?|replace(_callback)?|match))?)|l(ist_encodings|anguage)|regex_(set_options|encoding)|get_info)\\b"
         },
         {
-          "match": "(?i)\\bm(crypt_(c(fb|reate_iv|bc)|ofb|decrypt|e(nc(_(self_test|is_block_(algorithm(_mode)?|mode)|get_(supported_key_sizes|iv_size|key_size|algorithms_name|modes_name|block_size))|rypt)|cb)|list_(algorithms|modes)|ge(neric(_(init|deinit|end))?|t_(cipher_name|iv_size|key_size|block_size))|module_(self_test|close|is_block_(algorithm(_mode)?|mode)|open|get_(supported_key_sizes|algo_(key_size|block_size))))|decrypt_generic)\\b",
-          "name": "support.function.mcrypt.php"
+          "name": "support.function.mcrypt.php",
+          "match": "(?i)\\bm(crypt_(c(fb|reate_iv|bc)|ofb|decrypt|e(nc(_(self_test|is_block_(algorithm(_mode)?|mode)|get_(supported_key_sizes|iv_size|key_size|algorithms_name|modes_name|block_size))|rypt)|cb)|list_(algorithms|modes)|ge(neric(_(init|deinit|end))?|t_(cipher_name|iv_size|key_size|block_size))|module_(self_test|close|is_block_(algorithm(_mode)?|mode)|open|get_(supported_key_sizes|algo_(key_size|block_size))))|decrypt_generic)\\b"
         },
         {
-          "match": "(?i)\\bmemcache_debug\\b",
-          "name": "support.function.memcache.php"
+          "name": "support.function.memcache.php",
+          "match": "(?i)\\bmemcache_debug\\b"
         },
         {
-          "match": "(?i)\\bmhash(_(count|keygen_s2k|get_(hash_name|block_size)))?\\b",
-          "name": "support.function.mhash.php"
+          "name": "support.function.mhash.php",
+          "match": "(?i)\\bmhash(_(count|keygen_s2k|get_(hash_name|block_size)))?\\b"
         },
         {
-          "match": "(?i)\\b(log_(cmd_(insert|delete|update)|killcursor|write_batch|reply|getmore)|bson_(decode|encode))\\b",
-          "name": "support.function.mongo.php"
+          "name": "support.function.mongo.php",
+          "match": "(?i)\\b(log_(cmd_(insert|delete|update)|killcursor|write_batch|reply|getmore)|bson_(decode|encode))\\b"
         },
         {
-          "match": "(?i)\\bmysql_(s(tat|e(t_charset|lect_db))|num_(fields|rows)|c(onnect|l(ient_encoding|ose)|reate_db)|t(hread_id|ablename)|in(sert_id|fo)|d(ata_seek|rop_db|b_(name|query))|unbuffered_query|p(connect|ing)|e(scape_string|rr(no|or))|query|f(ield_(seek|name|t(ype|able)|flags|len)|etch_(object|field|lengths|a(ssoc|rray)|row)|ree_result)|list_(tables|dbs|processes|fields)|affected_rows|re(sult|al_escape_string)|get_(server_info|host_info|client_info|proto_info))\\b",
-          "name": "support.function.mysql.php"
+          "name": "support.function.mysql.php",
+          "match": "(?i)\\bmysql_(s(tat|e(t_charset|lect_db))|num_(fields|rows)|c(onnect|l(ient_encoding|ose)|reate_db)|t(hread_id|ablename)|in(sert_id|fo)|d(ata_seek|rop_db|b_(name|query))|unbuffered_query|p(connect|ing)|e(scape_string|rr(no|or))|query|f(ield_(seek|name|t(ype|able)|flags|len)|etch_(object|field|lengths|a(ssoc|rray)|row)|ree_result)|list_(tables|dbs|processes|fields)|affected_rows|re(sult|al_escape_string)|get_(server_info|host_info|client_info|proto_info))\\b"
         },
         {
-          "match": "(?i)\\bmysqli_(s(sl_set|t(ore_result|at|mt_(s(tore_result|end_long_data)|next_result|close|init|data_seek|prepare|execute|f(etch|ree_result)|attr_(set|get)|res(ult_metadata|et)|get_(warnings|result)|more_results|bind_(param|result)))|e(nd_(query|long_data)|t_(charset|opt|local_infile_(handler|default))|lect_db)|lave_query|avepoint)|next_result|c(ha(nge_user|racter_set_name)|o(nnect|mmit)|l(ient_encoding|ose))|thread_safe|init|options|d(isable_r(pl_parse|eads_from_master)|ump_debug_info|ebug|ata_seek)|use_result|p(ing|oll|aram_count|repare)|e(scape_string|nable_r(pl_parse|eads_from_master)|xecute|mbedded_server_(start|end))|kill|query|f(ield_seek|etch(_(object|field(s|_direct)?|a(ssoc|ll|rray)|row))?|ree_result)|autocommit|r(ollback|pl_(p(arse_enabled|robe)|query_type)|e(port|fresh|lease_savepoint|a(p_async_query|l_(connect|escape_string|query))))|get_(c(harset|onnection_stats|lient_(stats|info|version)|ache_stats)|warnings|links_stats|metadata)|m(ore_results|ulti_query|aster_query)|b(ind_(param|result)|egin_transaction))\\b",
-          "name": "support.function.mysqli.php"
+          "name": "support.function.mysqli.php",
+          "match": "(?i)\\bmysqli_(s(sl_set|t(ore_result|at|mt_(s(tore_result|end_long_data)|next_result|close|init|data_seek|prepare|execute|f(etch|ree_result)|attr_(set|get)|res(ult_metadata|et)|get_(warnings|result)|more_results|bind_(param|result)))|e(nd_(query|long_data)|t_(charset|opt|local_infile_(handler|default))|lect_db)|lave_query|avepoint)|next_result|c(ha(nge_user|racter_set_name)|o(nnect|mmit)|l(ient_encoding|ose))|thread_safe|init|options|d(isable_r(pl_parse|eads_from_master)|ump_debug_info|ebug|ata_seek)|use_result|p(ing|oll|aram_count|repare)|e(scape_string|nable_r(pl_parse|eads_from_master)|xecute|mbedded_server_(start|end))|kill|query|f(ield_seek|etch(_(object|field(s|_direct)?|a(ssoc|ll|rray)|row))?|ree_result)|autocommit|r(ollback|pl_(p(arse_enabled|robe)|query_type)|e(port|fresh|lease_savepoint|a(p_async_query|l_(connect|escape_string|query))))|get_(c(harset|onnection_stats|lient_(stats|info|version)|ache_stats)|warnings|links_stats|metadata)|m(ore_results|ulti_query|aster_query)|b(ind_(param|result)|egin_transaction))\\b"
         },
         {
-          "match": "(?i)\\bmysqlnd_memcache_(set|get_config)\\b",
-          "name": "support.function.mysqlnd-memcache.php"
+          "name": "support.function.mysqlnd-memcache.php",
+          "match": "(?i)\\bmysqlnd_memcache_(set|get_config)\\b"
         },
         {
-          "match": "(?i)\\bmysqlnd_ms_(set_(user_pick_server|qos)|dump_servers|query_is_select|fabric_select_(shard|global)|get_(stats|last_(used_connection|gtid))|xa_(commit|rollback|gc|begin)|match_wild)\\b",
-          "name": "support.function.mysqlnd-ms.php"
+          "name": "support.function.mysqlnd-ms.php",
+          "match": "(?i)\\bmysqlnd_ms_(set_(user_pick_server|qos)|dump_servers|query_is_select|fabric_select_(shard|global)|get_(stats|last_(used_connection|gtid))|xa_(commit|rollback|gc|begin)|match_wild)\\b"
         },
         {
-          "match": "(?i)\\bmysqlnd_qc_(set_(storage_handler|cache_condition|is_select|user_handlers)|clear_cache|get_(normalized_query_trace_log|c(ore_stats|ache_info)|query_trace_log|available_handlers))\\b",
-          "name": "support.function.mysqlnd-qc.php"
+          "name": "support.function.mysqlnd-qc.php",
+          "match": "(?i)\\bmysqlnd_qc_(set_(storage_handler|cache_condition|is_select|user_handlers)|clear_cache|get_(normalized_query_trace_log|c(ore_stats|ache_info)|query_trace_log|available_handlers))\\b"
         },
         {
-          "match": "(?i)\\bmysqlnd_uh_(set_(statement_proxy|connection_proxy)|convert_to_mysqlnd)\\b",
-          "name": "support.function.mysqlnd-uh.php"
+          "name": "support.function.mysqlnd-uh.php",
+          "match": "(?i)\\bmysqlnd_uh_(set_(statement_proxy|connection_proxy)|convert_to_mysqlnd)\\b"
         },
         {
-          "match": "(?i)\\b(s(yslog|ocket_(set_(timeout|blocking)|get_status)|et(cookie|rawcookie))|h(ttp_response_code|eader(s_(sent|list)|_re(gister_callback|move))?)|c(heckdnsrr|loselog)|i(net_(ntop|pton)|p2long)|openlog|d(ns_(check_record|get_(record|mx))|efine_syslog_variables)|pfsockopen|fsockopen|long2ip|get(servby(name|port)|host(name|by(name(l)?|addr))|protobyn(umber|ame)|mxrr))\\b",
-          "name": "support.function.network.php"
+          "name": "support.function.network.php",
+          "match": "(?i)\\b(s(yslog|ocket_(set_(timeout|blocking)|get_status)|et(cookie|rawcookie))|h(ttp_response_code|eader(s_(sent|list)|_re(gister_callback|move))?)|c(heckdnsrr|loselog)|i(net_(ntop|pton)|p2long)|openlog|d(ns_(check_record|get_(record|mx))|efine_syslog_variables)|pfsockopen|fsockopen|long2ip|get(servby(name|port)|host(name|by(name(l)?|addr))|protobyn(umber|ame)|mxrr))\\b"
         },
         {
-          "match": "(?i)\\bnsapi_(virtual|re(sponse_headers|quest_headers))\\b",
-          "name": "support.function.nsapi.php"
+          "name": "support.function.nsapi.php",
+          "match": "(?i)\\bnsapi_(virtual|re(sponse_headers|quest_headers))\\b"
         },
         {
-          "match": "(?i)\\boci(s(tatementtype|e(tprefetch|rverversion)|avelob(file)?)|n(umcols|ew(c(ollection|ursor)|descriptor)|logon)|c(o(l(umn(s(cale|ize)|name|type(raw)?|isnull|precision)|l(size|trim|a(ssign(elem)?|ppend)|getelem|max))|mmit)|loselob|ancel)|internaldebug|definebyname|_(s(tatement_type|e(t_(client_i(nfo|dentifier)|prefetch|edition|action|module_name)|rver_version))|n(um_(fields|rows)|ew_(c(o(nnect|llection)|ursor)|descriptor))|c(o(nnect|mmit)|l(ient_version|ose)|ancel)|internal_debug|d(isable_taf_callback|efine_by_name)|p(connect|a(ssword_change|rse))|e(rror|xecute)|f(ield_(s(cale|ize)|name|type(_raw)?|is_null|precision)|etch(_(object|a(ssoc|ll|rray)|row))?|ree_(statement|descriptor))|lob_(copy|is_equal)|r(ollback|e(sult|gister_taf_callback))|get_implicit_resultset|bind_(array_by_name|by_name))|p(logon|arse)|e(rror|xecute)|f(etch(statement|into)?|ree(statement|c(ollection|ursor)|desc))|write(temporarylob|lobtofile)|lo(adlob|go(n|ff))|r(o(wcount|llback)|esult)|bindbyname)\\b",
-          "name": "support.function.oci8.php"
+          "name": "support.function.oci8.php",
+          "match": "(?i)\\boci(s(tatementtype|e(tprefetch|rverversion)|avelob(file)?)|n(umcols|ew(c(ollection|ursor)|descriptor)|logon)|c(o(l(umn(s(cale|ize)|name|type(raw)?|isnull|precision)|l(size|trim|a(ssign(elem)?|ppend)|getelem|max))|mmit)|loselob|ancel)|internaldebug|definebyname|_(s(tatement_type|e(t_(client_i(nfo|dentifier)|prefetch|edition|action|module_name)|rver_version))|n(um_(fields|rows)|ew_(c(o(nnect|llection)|ursor)|descriptor))|c(o(nnect|mmit)|l(ient_version|ose)|ancel)|internal_debug|d(isable_taf_callback|efine_by_name)|p(connect|a(ssword_change|rse))|e(rror|xecute)|f(ield_(s(cale|ize)|name|type(_raw)?|is_null|precision)|etch(_(object|a(ssoc|ll|rray)|row))?|ree_(statement|descriptor))|lob_(copy|is_equal)|r(ollback|e(sult|gister_taf_callback))|get_implicit_resultset|bind_(array_by_name|by_name))|p(logon|arse)|e(rror|xecute)|f(etch(statement|into)?|ree(statement|c(ollection|ursor)|desc))|write(temporarylob|lobtofile)|lo(adlob|go(n|ff))|r(o(wcount|llback)|esult)|bindbyname)\\b"
         },
         {
-          "match": "(?i)\\bopcache_(compile_file|i(s_script_cached|nvalidate)|reset|get_(status|configuration))\\b",
-          "name": "support.function.opcache.php"
+          "name": "support.function.opcache.php",
+          "match": "(?i)\\bopcache_(compile_file|i(s_script_cached|nvalidate)|reset|get_(status|configuration))\\b"
         },
         {
-          "match": "(?i)\\bopenssl_(s(ign|pki_(new|export(_challenge)?|verify)|eal)|c(sr_(sign|new|export(_to_file)?|get_(subject|public_key))|ipher_iv_length)|open|d(h_compute_key|igest|ecrypt)|p(ublic_(decrypt|encrypt)|k(cs(12_(export(_to_file)?|read)|7_(sign|decrypt|encrypt|verify))|ey_(new|export(_to_file)?|free|get_(details|p(ublic|rivate))))|rivate_(decrypt|encrypt)|bkdf2)|e(ncrypt|rror_string)|verify|free_key|random_pseudo_bytes|get_(c(ipher_methods|ert_locations)|p(ublickey|rivatekey)|md_methods)|x509_(check(_private_key|purpose)|parse|export(_to_file)?|f(ingerprint|ree)|read))\\b",
-          "name": "support.function.openssl.php"
+          "name": "support.function.openssl.php",
+          "match": "(?i)\\bopenssl_(s(ign|pki_(new|export(_challenge)?|verify)|eal)|c(sr_(sign|new|export(_to_file)?|get_(subject|public_key))|ipher_iv_length)|open|d(h_compute_key|igest|ecrypt)|p(ublic_(decrypt|encrypt)|k(cs(12_(export(_to_file)?|read)|7_(sign|decrypt|encrypt|verify))|ey_(new|export(_to_file)?|free|get_(details|p(ublic|rivate))))|rivate_(decrypt|encrypt)|bkdf2)|e(ncrypt|rror_string)|verify|free_key|random_pseudo_bytes|get_(c(ipher_methods|ert_locations)|p(ublickey|rivatekey)|md_methods)|x509_(check(_private_key|purpose)|parse|export(_to_file)?|f(ingerprint|ree)|read))\\b"
         },
         {
-          "match": "(?i)\\b(o(utput_(add_rewrite_var|reset_rewrite_vars)|b_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|g(zhandler|et_(status|c(ontents|lean)|flush|le(ngth|vel)))))|flush)\\b",
-          "name": "support.function.output.php"
+          "name": "support.function.output.php",
+          "match": "(?i)\\b(o(utput_(add_rewrite_var|reset_rewrite_vars)|b_(start|clean|implicit_flush|end_(clean|flush)|flush|list_handlers|g(zhandler|et_(status|c(ontents|lean)|flush|le(ngth|vel)))))|flush)\\b"
         },
         {
-          "match": "(?i)\\bpassword_(hash|needs_rehash|verify|get_info)\\b",
-          "name": "support.function.password.php"
+          "name": "support.function.password.php",
+          "match": "(?i)\\bpassword_(hash|needs_rehash|verify|get_info)\\b"
         },
         {
-          "match": "(?i)\\bpcntl_(s(trerror|ig(nal(_(dispatch|get_handler))?|timedwait|procmask|waitinfo)|etpriority)|e(rrno|xec)|fork|w(stopsig|termsig|if(s(topped|ignaled)|exited)|exitstatus|ait(pid)?)|alarm|get(_last_error|priority))\\b",
-          "name": "support.function.pcntl.php"
+          "name": "support.function.pcntl.php",
+          "match": "(?i)\\bpcntl_(s(trerror|ig(nal(_(dispatch|get_handler))?|timedwait|procmask|waitinfo)|etpriority)|e(rrno|xec)|fork|w(stopsig|termsig|if(s(topped|ignaled)|exited)|exitstatus|ait(pid)?)|alarm|get(_last_error|priority))\\b"
         },
         {
-          "match": "(?i)\\bpg_(s(ocket|e(nd_(prepare|execute|query(_params)?)|t_(client_encoding|error_verbosity)|lect))|host|num_(fields|rows)|c(o(n(sume_input|nect(ion_(status|reset|busy)|_poll)?|vert)|py_(to|from))|l(ient_encoding|ose)|ancel_query)|t(ty|ra(nsaction_status|ce))|insert|options|d(elete|bname)|u(n(trace|escape_bytea)|pdate)|p(connect|ing|ort|ut_line|arameter_status|repare)|e(scape_(string|identifier|literal|bytea)|nd_copy|xecute)|version|query(_params)?|f(ield_(size|n(um|ame)|t(ype(_oid)?|able)|is_null|prtlen)|etch_(object|a(ssoc|ll(_columns)?|rray)|r(ow|esult))|lush|ree_result)|l(o_(seek|c(lose|reate)|t(ell|runcate)|import|open|unlink|export|write|read(_all)?)|ast_(notice|oid|error))|affected_rows|result_(s(tatus|eek)|error(_field)?)|get_(notify|pid|result)|meta_data)\\b",
-          "name": "support.function.pgsql.php"
+          "name": "support.function.pgsql.php",
+          "match": "(?i)\\bpg_(s(ocket|e(nd_(prepare|execute|query(_params)?)|t_(client_encoding|error_verbosity)|lect))|host|num_(fields|rows)|c(o(n(sume_input|nect(ion_(status|reset|busy)|_poll)?|vert)|py_(to|from))|l(ient_encoding|ose)|ancel_query)|t(ty|ra(nsaction_status|ce))|insert|options|d(elete|bname)|u(n(trace|escape_bytea)|pdate)|p(connect|ing|ort|ut_line|arameter_status|repare)|e(scape_(string|identifier|literal|bytea)|nd_copy|xecute)|version|query(_params)?|f(ield_(size|n(um|ame)|t(ype(_oid)?|able)|is_null|prtlen)|etch_(object|a(ssoc|ll(_columns)?|rray)|r(ow|esult))|lush|ree_result)|l(o_(seek|c(lose|reate)|t(ell|runcate)|import|open|unlink|export|write|read(_all)?)|ast_(notice|oid|error))|affected_rows|result_(s(tatus|eek)|error(_field)?)|get_(notify|pid|result)|meta_data)\\b"
         },
         {
-          "match": "(?i)\\b(virtual|apache_(setenv|note|child_terminate|lookup_uri|re(s(ponse_headers|et_timeout)|quest_headers)|get(_(version|modules)|env))|getallheaders)\\b",
-          "name": "support.function.php_apache.php"
+          "name": "support.function.php_apache.php",
+          "match": "(?i)\\b(virtual|apache_(setenv|note|child_terminate|lookup_uri|re(s(ponse_headers|et_timeout)|quest_headers)|get(_(version|modules)|env))|getallheaders)\\b"
         },
         {
-          "match": "(?i)\\bdom_import_simplexml\\b",
-          "name": "support.function.php_dom.php"
+          "name": "support.function.php_dom.php",
+          "match": "(?i)\\bdom_import_simplexml\\b"
         },
         {
-          "match": "(?i)\\bftp_(s(sl_connect|ystype|i(te|ze)|et_option)|n(list|b_(continue|put|f(put|get)|get))|c(h(dir|mod)|onnect|dup|lose)|delete|p(ut|wd|asv)|exec|quit|f(put|get)|login|alloc|r(ename|aw(list)?|mdir)|get(_option)?|m(dtm|kdir))\\b",
-          "name": "support.function.php_ftp.php"
+          "name": "support.function.php_ftp.php",
+          "match": "(?i)\\bftp_(s(sl_connect|ystype|i(te|ze)|et_option)|n(list|b_(continue|put|f(put|get)|get))|c(h(dir|mod)|onnect|dup|lose)|delete|p(ut|wd|asv)|exec|quit|f(put|get)|login|alloc|r(ename|aw(list)?|mdir)|get(_option)?|m(dtm|kdir))\\b"
         },
         {
-          "match": "(?i)\\bimap_(s(can(mailbox)?|tatus|ort|ubscribe|e(t(_quota|flag_full|acl)|arch)|avebody)|header(s|info)?|num_(recent|msg)|c(heck|l(ose|earflag_full)|reate(mailbox)?)|t(hread|imeout)|open|delete(mailbox)?|8bit|u(n(subscribe|delete)|tf(7_(decode|encode)|8)|id)|ping|e(rrors|xpunge)|qprint|fetch(structure|header|text|_overview|mime|body)|l(sub|ist(s(can|ubscribed)|mailbox)?|ast_error)|a(ppend|lerts)|r(e(name(mailbox)?|open)|fc822_(parse_(headers|adrlist)|write_address))|g(c|et(subscribed|_quota(root)?|acl|mailboxes))|m(sgno|ime_header_decode|ail(_(co(py|mpose)|move)|boxmsginfo)?)|b(inary|ody(struct)?|ase64))\\b",
-          "name": "support.function.php_imap.php"
+          "name": "support.function.php_imap.php",
+          "match": "(?i)\\bimap_(s(can(mailbox)?|tatus|ort|ubscribe|e(t(_quota|flag_full|acl)|arch)|avebody)|header(s|info)?|num_(recent|msg)|c(heck|l(ose|earflag_full)|reate(mailbox)?)|t(hread|imeout)|open|delete(mailbox)?|8bit|u(n(subscribe|delete)|tf(7_(decode|encode)|8)|id)|ping|e(rrors|xpunge)|qprint|fetch(structure|header|text|_overview|mime|body)|l(sub|ist(s(can|ubscribed)|mailbox)?|ast_error)|a(ppend|lerts)|r(e(name(mailbox)?|open)|fc822_(parse_(headers|adrlist)|write_address))|g(c|et(subscribed|_quota(root)?|acl|mailboxes))|m(sgno|ime_header_decode|ail(_(co(py|mpose)|move)|boxmsginfo)?)|b(inary|ody(struct)?|ase64))\\b"
         },
         {
-          "match": "(?i)\\bmssql_(select_db|n(um_(fields|rows)|ext_result)|c(onnect|lose)|init|data_seek|pconnect|execute|query|f(ield_(seek|name|type|length)|etch_(object|field|a(ssoc|rray)|row|batch)|ree_(statement|result))|r(ows_affected|esult)|g(uid_string|et_last_message)|min_(error_severity|message_severity)|bind)\\b",
-          "name": "support.function.php_mssql.php"
+          "name": "support.function.php_mssql.php",
+          "match": "(?i)\\bmssql_(select_db|n(um_(fields|rows)|ext_result)|c(onnect|lose)|init|data_seek|pconnect|execute|query|f(ield_(seek|name|type|length)|etch_(object|field|a(ssoc|rray)|row|batch)|ree_(statement|result))|r(ows_affected|esult)|g(uid_string|et_last_message)|min_(error_severity|message_severity)|bind)\\b"
         },
         {
-          "match": "(?i)\\bodbc_(s(tatistics|pecialcolumns|etoption)|n(um_(fields|rows)|ext_result)|c(o(nnect|lumn(s|privileges)|mmit)|ursor|lose(_all)?)|table(s|privileges)|d(o|ata_source)|p(connect|r(imarykeys|ocedure(s|columns)|epare))|e(rror(msg)?|xec(ute)?)|f(ield_(scale|n(um|ame)|type|precision|len)|oreignkeys|etch_(into|object|array|row)|ree_result)|longreadlen|autocommit|r(ollback|esult(_all)?)|gettypeinfo|binmode)\\b",
-          "name": "support.function.php_odbc.php"
+          "name": "support.function.php_odbc.php",
+          "match": "(?i)\\bodbc_(s(tatistics|pecialcolumns|etoption)|n(um_(fields|rows)|ext_result)|c(o(nnect|lumn(s|privileges)|mmit)|ursor|lose(_all)?)|table(s|privileges)|d(o|ata_source)|p(connect|r(imarykeys|ocedure(s|columns)|epare))|e(rror(msg)?|xec(ute)?)|f(ield_(scale|n(um|ame)|type|precision|len)|oreignkeys|etch_(into|object|array|row)|ree_result)|longreadlen|autocommit|r(ollback|esult(_all)?)|gettypeinfo|binmode)\\b"
         },
         {
-          "match": "(?i)\\bpreg_(split|quote|filter|last_error|replace(_callback(_array)?)?|grep|match(_all)?)\\b",
-          "name": "support.function.php_pcre.php"
+          "name": "support.function.php_pcre.php",
+          "match": "(?i)\\bpreg_(split|quote|filter|last_error|replace(_callback(_array)?)?|grep|match(_all)?)\\b"
         },
         {
-          "match": "(?i)\\b(spl_(classes|object_hash|autoload(_(call|unregister|extensions|functions|register))?)|class_(implements|uses|parents)|iterator_(count|to_array|apply))\\b",
-          "name": "support.function.php_spl.php"
+          "name": "support.function.php_spl.php",
+          "match": "(?i)\\b(spl_(classes|object_hash|autoload(_(call|unregister|extensions|functions|register))?)|class_(implements|uses|parents)|iterator_(count|to_array|apply))\\b"
         },
         {
-          "match": "(?i)\\bzip_(close|open|entry_(name|c(ompress(ionmethod|edsize)|lose)|open|filesize|read)|read)\\b",
-          "name": "support.function.php_zip.php"
+          "name": "support.function.php_zip.php",
+          "match": "(?i)\\bzip_(close|open|entry_(name|c(ompress(ionmethod|edsize)|lose)|open|filesize|read)|read)\\b"
         },
         {
-          "match": "(?i)\\bposix_(s(trerror|et(sid|uid|pgid|e(uid|gid)|rlimit|gid))|ctermid|t(tyname|imes)|i(satty|nitgroups)|uname|errno|kill|access|get(sid|cwd|uid|_last_error|p(id|pid|w(nam|uid)|g(id|rp))|e(uid|gid)|login|rlimit|g(id|r(nam|oups|gid)))|mk(nod|fifo))\\b",
-          "name": "support.function.posix.php"
+          "name": "support.function.posix.php",
+          "match": "(?i)\\bposix_(s(trerror|et(sid|uid|pgid|e(uid|gid)|rlimit|gid))|ctermid|t(tyname|imes)|i(satty|nitgroups)|uname|errno|kill|access|get(sid|cwd|uid|_last_error|p(id|pid|w(nam|uid)|g(id|rp))|e(uid|gid)|login|rlimit|g(id|r(nam|oups|gid)))|mk(nod|fifo))\\b"
         },
         {
-          "match": "(?i)\\bset(threadtitle|proctitle)\\b",
-          "name": "support.function.proctitle.php"
+          "name": "support.function.proctitle.php",
+          "match": "(?i)\\bset(threadtitle|proctitle)\\b"
         },
         {
-          "match": "(?i)\\bpspell_(s(tore_replacement|uggest|ave_wordlist)|new(_(config|personal))?|c(heck|onfig_(save_repl|create|ignore|d(ict_dir|ata_dir)|personal|r(untogether|epl)|mode)|lear_session)|add_to_(session|personal))\\b",
-          "name": "support.function.pspell.php"
+          "name": "support.function.pspell.php",
+          "match": "(?i)\\bpspell_(s(tore_replacement|uggest|ave_wordlist)|new(_(config|personal))?|c(heck|onfig_(save_repl|create|ignore|d(ict_dir|ata_dir)|personal|r(untogether|epl)|mode)|lear_session)|add_to_(session|personal))\\b"
         },
         {
-          "match": "(?i)\\breadline(_(c(ompletion_function|lear_history|allback_(handler_(install|remove)|read_char))|info|on_new_line|write_history|list_history|add_history|re(display|ad_history)))?\\b",
-          "name": "support.function.readline.php"
+          "name": "support.function.readline.php",
+          "match": "(?i)\\breadline(_(c(ompletion_function|lear_history|allback_(handler_(install|remove)|read_char))|info|on_new_line|write_history|list_history|add_history|re(display|ad_history)))?\\b"
         },
         {
-          "match": "(?i)\\brecode(_(string|file))?\\b",
-          "name": "support.function.recode.php"
+          "name": "support.function.recode.php",
+          "match": "(?i)\\brecode(_(string|file))?\\b"
         },
         {
-          "match": "(?i)\\brrd(c_disconnect|_(create|tune|info|update|error|version|f(irst|etch)|last(update)?|restore|graph|xport))\\b",
-          "name": "support.function.rrd.php"
+          "name": "support.function.rrd.php",
+          "match": "(?i)\\brrd(c_disconnect|_(create|tune|info|update|error|version|f(irst|etch)|last(update)?|restore|graph|xport))\\b"
         },
         {
-          "match": "(?i)\\b(s(hm_(has_var|detach|put_var|attach|remove(_var)?|get_var)|em_(acquire|re(lease|move)|get))|ftok|msg_(s(tat_queue|e(nd|t_queue))|queue_exists|re(ceive|move_queue)|get_queue))\\b",
-          "name": "support.function.sem.php"
+          "name": "support.function.sem.php",
+          "match": "(?i)\\b(s(hm_(has_var|detach|put_var|attach|remove(_var)?|get_var)|em_(acquire|re(lease|move)|get))|ftok|msg_(s(tat_queue|e(nd|t_queue))|queue_exists|re(ceive|move_queue)|get_queue))\\b"
         },
         {
-          "match": "(?i)\\bsession_(s(ta(tus|rt)|et_(save_handler|cookie_params)|ave_path)|name|c(ommit|ache_(expire|limiter)|reate_id)|i(s_registered|d)|de(stroy|code)|un(set|register)|encode|write_close|abort|re(set|g(ister(_shutdown)?|enerate_id))|g(c|et_cookie_params)|module_name)\\b",
-          "name": "support.function.session.php"
+          "name": "support.function.session.php",
+          "match": "(?i)\\bsession_(s(ta(tus|rt)|et_(save_handler|cookie_params)|ave_path)|name|c(ommit|ache_(expire|limiter)|reate_id)|i(s_registered|d)|de(stroy|code)|un(set|register)|encode|write_close|abort|re(set|g(ister(_shutdown)?|enerate_id))|g(c|et_cookie_params)|module_name)\\b"
         },
         {
-          "match": "(?i)\\bshmop_(size|close|open|delete|write|read)\\b",
-          "name": "support.function.shmop.php"
+          "name": "support.function.shmop.php",
+          "match": "(?i)\\bshmop_(size|close|open|delete|write|read)\\b"
         },
         {
-          "match": "(?i)\\bsimplexml_(import_dom|load_(string|file))\\b",
-          "name": "support.function.simplexml.php"
+          "name": "support.function.simplexml.php",
+          "match": "(?i)\\bsimplexml_(import_dom|load_(string|file))\\b"
         },
         {
-          "match": "(?i)\\bsnmp(set|2_(set|walk|real_walk|get(next)?)|_(set_(oid_(numeric_print|output_format)|enum_print|valueretrieval|quick_print)|read_mib|get_(valueretrieval|quick_print))|3_(set|walk|real_walk|get(next)?)|walk(oid)?|realwalk|get(next)?)\\b",
-          "name": "support.function.snmp.php"
+          "name": "support.function.snmp.php",
+          "match": "(?i)\\bsnmp(set|2_(set|walk|real_walk|get(next)?)|_(set_(oid_(numeric_print|output_format)|enum_print|valueretrieval|quick_print)|read_mib|get_(valueretrieval|quick_print))|3_(set|walk|real_walk|get(next)?)|walk(oid)?|realwalk|get(next)?)\\b"
         },
         {
-          "match": "(?i)\\b(is_soap_fault|use_soap_error_handler)\\b",
-          "name": "support.function.soap.php"
+          "name": "support.function.soap.php",
+          "match": "(?i)\\b(is_soap_fault|use_soap_error_handler)\\b"
         },
         {
-          "match": "(?i)\\bsocket_(s(hutdown|trerror|e(nd(to|msg)?|t(opt|_(nonblock|option|block))|lect))|c(onnect|l(ose|ear_error)|reate(_(pair|listen))?|msg_space)|import_stream|write|l(isten|ast_error)|accept|re(cv(from|msg)?|ad)|get(sockname|opt|_option|peername)|bind)\\b",
-          "name": "support.function.sockets.php"
+          "name": "support.function.sockets.php",
+          "match": "(?i)\\bsocket_(s(hutdown|trerror|e(nd(to|msg)?|t(opt|_(nonblock|option|block))|lect))|c(onnect|l(ose|ear_error)|reate(_(pair|listen))?|msg_space)|import_stream|write|l(isten|ast_error)|accept|re(cv(from|msg)?|ad)|get(sockname|opt|_option|peername)|bind)\\b"
         },
         {
-          "match": "(?i)\\bsqlite_(s(ingle_query|eek)|has_(prev|more)|n(um_(fields|rows)|ext)|c(hanges|olumn|urrent|lose|reate_(function|aggregate))|open|u(nbuffered_query|df_(decode_binary|encode_binary))|p(open|rev)|e(scape_string|rror_string|xec)|valid|key|query|f(ield_name|etch_(s(tring|ingle)|column_types|object|a(ll|rray))|actory)|l(ib(encoding|version)|ast_(insert_rowid|error))|array_query|rewind|busy_timeout)\\b",
-          "name": "support.function.sqlite.php"
+          "name": "support.function.sqlite.php",
+          "match": "(?i)\\bsqlite_(s(ingle_query|eek)|has_(prev|more)|n(um_(fields|rows)|ext)|c(hanges|olumn|urrent|lose|reate_(function|aggregate))|open|u(nbuffered_query|df_(decode_binary|encode_binary))|p(open|rev)|e(scape_string|rror_string|xec)|valid|key|query|f(ield_name|etch_(s(tring|ingle)|column_types|object|a(ll|rray))|actory)|l(ib(encoding|version)|ast_(insert_rowid|error))|array_query|rewind|busy_timeout)\\b"
         },
         {
-          "match": "(?i)\\bsqlsrv_(se(nd_stream_data|rver_info)|has_rows|n(um_(fields|rows)|ext_result)|c(o(n(nect|figure)|mmit)|l(ient_info|ose)|ancel)|prepare|e(rrors|xecute)|query|f(ield_metadata|etch(_(object|array))?|ree_stmt)|ro(ws_affected|llback)|get_(config|field)|begin_transaction)\\b",
-          "name": "support.function.sqlsrv.php"
+          "name": "support.function.sqlsrv.php",
+          "match": "(?i)\\bsqlsrv_(se(nd_stream_data|rver_info)|has_rows|n(um_(fields|rows)|ext_result)|c(o(n(nect|figure)|mmit)|l(ient_info|ose)|ancel)|prepare|e(rrors|xecute)|query|f(ield_metadata|etch(_(object|array))?|ree_stmt)|ro(ws_affected|llback)|get_(config|field)|begin_transaction)\\b"
         },
         {
-          "match": "(?i)\\bstats_(s(ta(ndard_deviation|t_(noncentral_t|correlation|in(nerproduct|dependent_t)|p(owersum|ercentile|aired_t)|gennch|binomial_coef))|kew)|harmonic_mean|c(ovariance|df_(n(oncentral_(chisquare|f)|egative_binomial)|c(hisquare|auchy)|t|uniform|poisson|exponential|f|weibull|l(ogistic|aplace)|gamma|b(inomial|eta)))|den(s_(n(ormal|egative_binomial)|c(hisquare|auchy)|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|weibull|l(ogistic|aplace)|gamma|beta)|_uniform)|variance|kurtosis|absolute_deviation|rand_(setall|phrase_to_seeds|ranf|ge(n_(no(ncen(tral_(t|f)|ral_chisquare)|rmal)|chisquare|t|i(nt|uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta)|t_seeds)))\\b",
-          "name": "support.function.stats.php"
+          "name": "support.function.stats.php",
+          "match": "(?i)\\bstats_(s(ta(ndard_deviation|t_(noncentral_t|correlation|in(nerproduct|dependent_t)|p(owersum|ercentile|aired_t)|gennch|binomial_coef))|kew)|harmonic_mean|c(ovariance|df_(n(oncentral_(chisquare|f)|egative_binomial)|c(hisquare|auchy)|t|uniform|poisson|exponential|f|weibull|l(ogistic|aplace)|gamma|b(inomial|eta)))|den(s_(n(ormal|egative_binomial)|c(hisquare|auchy)|t|pmf_(hypergeometric|poisson|binomial)|exponential|f|weibull|l(ogistic|aplace)|gamma|beta)|_uniform)|variance|kurtosis|absolute_deviation|rand_(setall|phrase_to_seeds|ranf|ge(n_(no(ncen(tral_(t|f)|ral_chisquare)|rmal)|chisquare|t|i(nt|uniform|poisson|binomial(_negative)?)|exponential|f(uniform)?|gamma|beta)|t_seeds)))\\b"
         },
         {
-          "match": "(?i)\\bs(tream_(s(ocket_(s(hutdown|e(ndto|rver))|client|pair|enable_crypto|accept|recvfrom|get_name)|upports_lock|e(t_(chunk_size|timeout|write_buffer|read_buffer|blocking)|lect))|notification_callback|co(ntext_(set_(option|default|params)|create|get_(options|default|params))|py_to_stream)|is_local|encoding|filter_(prepend|append|re(gister|move))|wrapper_(unregister|re(store|gister))|re(solve_include_path|gister_wrapper)|get_(contents|transports|filters|wrappers|line|meta_data)|bucket_(new|prepend|append|make_writeable))|et_socket_blocking)\\b",
-          "name": "support.function.streamsfuncs.php"
+          "name": "support.function.streamsfuncs.php",
+          "match": "(?i)\\bs(tream_(s(ocket_(s(hutdown|e(ndto|rver))|client|pair|enable_crypto|accept|recvfrom|get_name)|upports_lock|e(t_(chunk_size|timeout|write_buffer|read_buffer|blocking)|lect))|notification_callback|co(ntext_(set_(option|default|params)|create|get_(options|default|params))|py_to_stream)|is_local|encoding|filter_(prepend|append|re(gister|move))|wrapper_(unregister|re(store|gister))|re(solve_include_path|gister_wrapper)|get_(contents|transports|filters|wrappers|line|meta_data)|bucket_(new|prepend|append|make_writeable))|et_socket_blocking)\\b"
         },
         {
-          "match": "(?i)\\b(s(scanf|ha1(_file)?|tr(s(tr|pn)|n(c(asecmp|mp)|atc(asecmp|mp))|c(spn|hr|oll|asecmp|mp)|t(o(upper|k|lower)|r)|i(str|p(slashes|cslashes|os|_tags))|_(s(huffle|plit)|ireplace|pad|word_count|r(ot13|ep(eat|lace))|getcsv)|p(os|brk)|len|r(chr|ipos|pos|ev))|imilar_text|oundex|ubstr(_(co(unt|mpare)|replace))?|printf|etlocale)|h(tml(specialchars(_decode)?|_entity_decode|entities)|e(x2bin|brev(c)?))|n(umber_format|l(2br|_langinfo))|c(h(op|unk_split|r)|o(nvert_(cyr_string|uu(decode|encode))|unt_chars)|r(ypt|c32))|trim|implode|ord|uc(first|words)|join|p(arse_str|rint(f)?)|e(cho|xplode)|v(sprintf|printf|fprintf)|quote(d_printable_(decode|encode)|meta)|fprintf|wordwrap|l(cfirst|trim|ocaleconv|evenshtein)|add(slashes|cslashes)|rtrim|get_html_translation_table|m(oney_format|d5(_file)?|etaphone)|bin2hex)\\b",
-          "name": "support.function.string.php"
+          "name": "support.function.string.php",
+          "match": "(?i)\\b(s(scanf|ha1(_file)?|tr(s(tr|pn)|n(c(asecmp|mp)|atc(asecmp|mp))|c(spn|hr|oll|asecmp|mp)|t(o(upper|k|lower)|r)|i(str|p(slashes|cslashes|os|_tags))|_(s(huffle|plit)|ireplace|pad|word_count|r(ot13|ep(eat|lace))|getcsv)|p(os|brk)|len|r(chr|ipos|pos|ev))|imilar_text|oundex|ubstr(_(co(unt|mpare)|replace))?|printf|etlocale)|h(tml(specialchars(_decode)?|_entity_decode|entities)|e(x2bin|brev(c)?))|n(umber_format|l(2br|_langinfo))|c(h(op|unk_split|r)|o(nvert_(cyr_string|uu(decode|encode))|unt_chars)|r(ypt|c32))|trim|implode|ord|uc(first|words)|join|p(arse_str|rint(f)?)|e(cho|xplode)|v(sprintf|printf|fprintf)|quote(d_printable_(decode|encode)|meta)|fprintf|wordwrap|l(cfirst|trim|ocaleconv|evenshtein)|add(slashes|cslashes)|rtrim|get_html_translation_table|m(oney_format|d5(_file)?|etaphone)|bin2hex)\\b"
         },
         {
-          "match": "(?i)\\bsybase_(se(t_message_handler|lect_db)|num_(fields|rows)|c(onnect|lose)|d(eadlock_retry_count|ata_seek)|unbuffered_query|pconnect|query|f(ield_seek|etch_(object|field|a(ssoc|rray)|row)|ree_result)|affected_rows|result|get_last_message|min_(server_severity|client_severity|error_severity|message_severity))\\b",
-          "name": "support.function.sybase.php"
+          "name": "support.function.sybase.php",
+          "match": "(?i)\\bsybase_(se(t_message_handler|lect_db)|num_(fields|rows)|c(onnect|lose)|d(eadlock_retry_count|ata_seek)|unbuffered_query|pconnect|query|f(ield_seek|etch_(object|field|a(ssoc|rray)|row)|ree_result)|affected_rows|result|get_last_message|min_(server_severity|client_severity|error_severity|message_severity))\\b"
         },
         {
-          "match": "(?i)\\b(taint|is_tainted|untaint)\\b",
-          "name": "support.function.taint.php"
+          "name": "support.function.taint.php",
+          "match": "(?i)\\b(taint|is_tainted|untaint)\\b"
         },
         {
-          "match": "(?i)\\b(tidy_(s(et(opt|_encoding)|ave_config)|c(onfig_count|lean_repair)|is_x(html|ml)|diagnose|parse_(string|file)|error_count|warning_count|load_config|access_count|re(set_config|pair_(string|file))|get(opt|_(status|h(tml(_ver)?|ead)|config|o(utput|pt_doc)|r(oot|elease)|body)))|ob_tidyhandler)\\b",
-          "name": "support.function.tidy.php"
+          "name": "support.function.tidy.php",
+          "match": "(?i)\\b(tidy_(s(et(opt|_encoding)|ave_config)|c(onfig_count|lean_repair)|is_x(html|ml)|diagnose|parse_(string|file)|error_count|warning_count|load_config|access_count|re(set_config|pair_(string|file))|get(opt|_(status|h(tml(_ver)?|ead)|config|o(utput|pt_doc)|r(oot|elease)|body)))|ob_tidyhandler)\\b"
         },
         {
-          "match": "(?i)\\btoken_(name|get_all)\\b",
-          "name": "support.function.tokenizer.php"
+          "name": "support.function.tokenizer.php",
+          "match": "(?i)\\btoken_(name|get_all)\\b"
         },
         {
-          "match": "(?i)\\btrader_(s(t(och(f|rsi)?|ddev)|in(h)?|u(m|b)|et_(compat|unstable_period)|qrt|ar(ext)?|ma)|ht_(sine|trend(line|mode)|dcp(hase|eriod)|phasor)|natr|c(ci|o(s(h)?|rrel)|dl(s(ho(otingstar|rtline)|t(icksandwich|alledpattern)|pinningtop|eparatinglines)|h(i(kkake(mod)?|ghwave)|omingpigeon|a(ngingman|rami(cross)?|mmer))|c(o(ncealbabyswall|unterattack)|losingmarubozu)|t(hrusting|a(sukigap|kuri)|ristar)|i(n(neck|vertedhammer)|dentical3crows)|2crows|onneck|d(oji(star)?|arkcloudcover|ragonflydoji)|u(nique3river|psidegap2crows)|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|piercing|e(ngulfing|vening(star|dojistar))|kicking(bylength)?|l(ongl(ine|eggeddoji)|adderbottom)|a(dvanceblock|bandonedbaby)|ri(sefall3methods|ckshawman)|g(apsidesidewhite|ravestonedoji)|xsidegap3methods|m(orning(star|dojistar)|a(t(hold|chinglow)|rubozu))|b(elthold|reakaway))|eil|mo)|t(sf|ypprice|3|ema|an(h)?|r(i(x|ma)|ange))|obv|d(iv|ema|x)|ultosc|p(po|lus_d(i|m))|e(rrno|xp|ma)|var|kama|floor|w(clprice|illr|ma)|l(n|inearreg(_(slope|intercept|angle))?|og10)|a(sin|cos|t(an|r)|d(osc|d|x(r)?)?|po|vgprice|roon(osc)?)|r(si|oc(p|r(100)?)?)|get_(compat|unstable_period)|m(i(n(index|us_d(i|m)|max(index)?)?|dp(oint|rice))|om|ult|edprice|fi|a(cd(ext|fix)?|vp|x(index)?|ma)?)|b(op|eta|bands))\\b",
-          "name": "support.function.trader.php"
+          "name": "support.function.trader.php",
+          "match": "(?i)\\btrader_(s(t(och(f|rsi)?|ddev)|in(h)?|u(m|b)|et_(compat|unstable_period)|qrt|ar(ext)?|ma)|ht_(sine|trend(line|mode)|dcp(hase|eriod)|phasor)|natr|c(ci|o(s(h)?|rrel)|dl(s(ho(otingstar|rtline)|t(icksandwich|alledpattern)|pinningtop|eparatinglines)|h(i(kkake(mod)?|ghwave)|omingpigeon|a(ngingman|rami(cross)?|mmer))|c(o(ncealbabyswall|unterattack)|losingmarubozu)|t(hrusting|a(sukigap|kuri)|ristar)|i(n(neck|vertedhammer)|dentical3crows)|2crows|onneck|d(oji(star)?|arkcloudcover|ragonflydoji)|u(nique3river|psidegap2crows)|3(starsinsouth|inside|outside|whitesoldiers|linestrike|blackcrows)|piercing|e(ngulfing|vening(star|dojistar))|kicking(bylength)?|l(ongl(ine|eggeddoji)|adderbottom)|a(dvanceblock|bandonedbaby)|ri(sefall3methods|ckshawman)|g(apsidesidewhite|ravestonedoji)|xsidegap3methods|m(orning(star|dojistar)|a(t(hold|chinglow)|rubozu))|b(elthold|reakaway))|eil|mo)|t(sf|ypprice|3|ema|an(h)?|r(i(x|ma)|ange))|obv|d(iv|ema|x)|ultosc|p(po|lus_d(i|m))|e(rrno|xp|ma)|var|kama|floor|w(clprice|illr|ma)|l(n|inearreg(_(slope|intercept|angle))?|og10)|a(sin|cos|t(an|r)|d(osc|d|x(r)?)?|po|vgprice|roon(osc)?)|r(si|oc(p|r(100)?)?)|get_(compat|unstable_period)|m(i(n(index|us_d(i|m)|max(index)?)?|dp(oint|rice))|om|ult|edprice|fi|a(cd(ext|fix)?|vp|x(index)?|ma)?)|b(op|eta|bands))\\b"
         },
         {
-          "match": "(?i)\\bUI\\\\(Draw\\\\Text\\\\Font\\\\fontFamilies|quit|run)\\b",
-          "name": "support.function.ui.php"
+          "name": "support.function.ui.php",
+          "match": "(?i)\\bUI\\\\(Draw\\\\Text\\\\Font\\\\fontFamilies|quit|run)\\b"
         },
         {
-          "match": "(?i)\\buopz_(co(py|mpose)|implement|overload|delete|undefine|extend|f(unction|lags)|re(store|name|define)|backup)\\b",
-          "name": "support.function.uopz.php"
+          "name": "support.function.uopz.php",
+          "match": "(?i)\\buopz_(co(py|mpose)|implement|overload|delete|undefine|extend|f(unction|lags)|re(store|name|define)|backup)\\b"
         },
         {
-          "match": "(?i)\\b(http_build_query|url(decode|encode)|parse_url|rawurl(decode|encode)|get_(headers|meta_tags)|base64_(decode|encode))\\b",
-          "name": "support.function.url.php"
+          "name": "support.function.url.php",
+          "match": "(?i)\\b(http_build_query|url(decode|encode)|parse_url|rawurl(decode|encode)|get_(headers|meta_tags)|base64_(decode|encode))\\b"
         },
         {
-          "match": "(?i)\\b(s(trval|e(ttype|rialize))|i(s(set|_(s(calar|tring)|nu(ll|meric)|callable|i(nt(eger)?|terable)|object|double|float|long|array|re(source|al)|bool))|ntval|mport_request_variables)|d(oubleval|ebug_zval_dump)|unse(t|rialize)|print_r|empty|var_(dump|export)|floatval|get(type|_(defined_vars|resource_type))|boolval)\\b",
-          "name": "support.function.var.php"
+          "name": "support.function.var.php",
+          "match": "(?i)\\b(s(trval|e(ttype|rialize))|i(s(set|_(s(calar|tring)|nu(ll|meric)|callable|i(nt(eger)?|terable)|object|double|float|long|array|re(source|al)|bool))|ntval|mport_request_variables)|d(oubleval|ebug_zval_dump)|unse(t|rialize)|print_r|empty|var_(dump|export)|floatval|get(type|_(defined_vars|resource_type))|boolval)\\b"
         },
         {
-          "match": "(?i)\\bwddx_(serialize_va(lue|rs)|deserialize|packet_(start|end)|add_vars)\\b",
-          "name": "support.function.wddx.php"
+          "name": "support.function.wddx.php",
+          "match": "(?i)\\bwddx_(serialize_va(lue|rs)|deserialize|packet_(start|end)|add_vars)\\b"
         },
         {
-          "match": "(?i)\\bxhprof_(sample_(disable|enable)|disable|enable)\\b",
-          "name": "support.function.xhprof.php"
+          "name": "support.function.xhprof.php",
+          "match": "(?i)\\bxhprof_(sample_(disable|enable)|disable|enable)\\b"
         },
         {
-          "match": "(?i)\\b(utf8_(decode|encode)|xml_(set_(start_namespace_decl_handler|notation_decl_handler|character_data_handler|object|default_handler|unparsed_entity_decl_handler|processing_instruction_handler|e(nd_namespace_decl_handler|lement_handler|xternal_entity_ref_handler))|parse(_into_struct|r_(set_option|create(_ns)?|free|get_option))?|error_string|get_(current_(column_number|line_number|byte_index)|error_code)))\\b",
-          "name": "support.function.xml.php"
+          "name": "support.function.xml.php",
+          "match": "(?i)\\b(utf8_(decode|encode)|xml_(set_(start_namespace_decl_handler|notation_decl_handler|character_data_handler|object|default_handler|unparsed_entity_decl_handler|processing_instruction_handler|e(nd_namespace_decl_handler|lement_handler|xternal_entity_ref_handler))|parse(_into_struct|r_(set_option|create(_ns)?|free|get_option))?|error_string|get_(current_(column_number|line_number|byte_index)|error_code)))\\b"
         },
         {
-          "match": "(?i)\\bxmlrpc_(se(t_type|rver_(c(all_method|reate)|destroy|add_introspection_data|register_(introspection_callback|method)))|is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|get_type)\\b",
-          "name": "support.function.xmlrpc.php"
+          "name": "support.function.xmlrpc.php",
+          "match": "(?i)\\bxmlrpc_(se(t_type|rver_(c(all_method|reate)|destroy|add_introspection_data|register_(introspection_callback|method)))|is_fault|decode(_request)?|parse_method_descriptions|encode(_request)?|get_type)\\b"
         },
         {
-          "match": "(?i)\\bxmlwriter_(s(tart_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element(_ns)?|attribute(_ns)?)|et_indent(_string)?)|text|o(utput_memory|pen_(uri|memory))|end_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element|attribute)|f(ull_end_element|lush)|write_(c(omment|data)|dtd(_(e(ntity|lement)|attlist))?|pi|element(_ns)?|attribute(_ns)?|raw))\\b",
-          "name": "support.function.xmlwriter.php"
+          "name": "support.function.xmlwriter.php",
+          "match": "(?i)\\bxmlwriter_(s(tart_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element(_ns)?|attribute(_ns)?)|et_indent(_string)?)|text|o(utput_memory|pen_(uri|memory))|end_(c(omment|data)|d(td(_(e(ntity|lement)|attlist))?|ocument)|pi|element|attribute)|f(ull_end_element|lush)|write_(c(omment|data)|dtd(_(e(ntity|lement)|attlist))?|pi|element(_ns)?|attribute(_ns)?|raw))\\b"
         },
         {
-          "match": "(?i)\\b(inflate_(init|add)|zlib_(decode|encode|get_coding_type)|deflate_(init|add)|readgzfile|gz(seek|c(ompress|lose)|tell|inflate|open|de(code|flate)|uncompress|p(uts|assthru)|e(ncode|of)|file|write|re(wind|ad)|get(s(s)?|c)))\\b",
-          "name": "support.function.zlib.php"
+          "name": "support.function.zlib.php",
+          "match": "(?i)\\b(inflate_(init|add)|zlib_(decode|encode|get_coding_type)|deflate_(init|add)|readgzfile|gz(seek|c(ompress|lose)|tell|inflate|open|de(code|flate)|uncompress|p(uts|assthru)|e(ncode|of)|file|write|re(wind|ad)|get(s(s)?|c)))\\b"
         },
         {
-          "match": "(?i)\\bis_int(eger)?\\b",
-          "name": "support.function.alias.php"
+          "name": "support.function.alias.php",
+          "match": "(?i)\\bis_int(eger)?\\b"
         }
       ]
     },
     "user-function-call": {
+      "name": "meta.function-call.php",
       "begin": "(?i)(?=[a-z_0-9\\\\]*[a-z_][a-z0-9_]*\\s*\\()",
       "end": "(?i)[a-z_][a-z_0-9]*(?=\\s*\\()",
-      "name": "meta.function-call.php",
       "patterns": [
         {
           "include": "#namespace"
@@ -2492,33 +2343,33 @@
     "var_basic": {
       "patterns": [
         {
+          "name": "variable.other.php",
+          "match": "(?x)\n        \t\t\t            (\\$+)[a-zA-Z_\\x{7f}-\\x{ff}]\n        \t\t\t            [a-zA-Z0-9_\\x{7f}-\\x{ff}]*?\\b",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "match": "(?x)\n        \t\t\t            (\\$+)[a-zA-Z_\\x{7f}-\\x{ff}]\n        \t\t\t            [a-zA-Z0-9_\\x{7f}-\\x{ff}]*?\\b",
-          "name": "variable.other.php"
+          }
         }
       ]
     },
     "var_global": {
+      "name": "variable.other.global.php",
+      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.php"
         }
-      },
-      "match": "(\\$)((_(COOKIE|FILES|GET|POST|REQUEST))|arg(v|c))\\b",
-      "name": "variable.other.global.php"
+      }
     },
     "var_global_safer": {
+      "name": "variable.other.global.safer.php",
+      "match": "(\\$)((GLOBALS|_(ENV|SERVER|SESSION)))",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.php"
         }
-      },
-      "match": "(\\$)((GLOBALS|_(ENV|SERVER|SESSION)))",
-      "name": "variable.other.global.safer.php"
+      }
     },
     "variable-name": {
       "patterns": [
@@ -2529,6 +2380,7 @@
           "include": "#var_global_safer"
         },
         {
+          "match": "(?x)\n\t\t\t\t\t\t((\\$)(?\u003cname\u003e[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t(-\u003e)(\\g\u003cname\u003e)\n\t\t\t\t\t\t\t|\n\t\t\t\t\t\t\t(\\[)\n\t\t\t\t\t\t\t\t(?:(\\d+)|((\\$)\\g\u003cname\u003e)|(\\w+))\n\t\t\t\t\t\t\t(\\])\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "variable.other.php"
@@ -2560,11 +2412,10 @@
             "9": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "comment": "Simple syntax: $foo, $foo[0], $foo[$bar], $foo->bar",
-          "match": "(?x)\n\t\t\t\t\t\t((\\$)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))\n\t\t\t\t\t\t(?:\n\t\t\t\t\t\t\t(->)(\\g<name>)\n\t\t\t\t\t\t\t|\n\t\t\t\t\t\t\t(\\[)\n\t\t\t\t\t\t\t\t(?:(\\d+)|((\\$)\\g<name>)|(\\w+))\n\t\t\t\t\t\t\t(\\])\n\t\t\t\t\t\t)?\n\t\t\t\t\t\t"
+          }
         },
         {
+          "match": "(?x)\n\t\t\t\t\t\t((\\$\\{)(?\u003cname\u003e[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\}))\n\t\t\t\t\t\t",
           "captures": {
             "1": {
               "name": "variable.other.php"
@@ -2575,9 +2426,7 @@
             "4": {
               "name": "punctuation.definition.variable.php"
             }
-          },
-          "comment": "Simple syntax with braces: \"foo${bar}baz\"",
-          "match": "(?x)\n\t\t\t\t\t\t((\\$\\{)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\}))\n\t\t\t\t\t\t"
+          }
         }
       ]
     },
@@ -2594,26 +2443,144 @@
         },
         {
           "begin": "(\\$\\{)(?=.*?\\})",
+          "end": "(\\})",
+          "patterns": [
+            {
+              "include": "#language"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
           },
-          "end": "(\\})",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.variable.php"
             }
+          }
+        }
+      ]
+    }
+  },
+  "injections": {
+    "^text.html - (meta.embedded | meta.tag), L:^text.html meta.tag, L:text.html.php source.js": {
+      "patterns": [
+        {
+          "begin": "(^\\s*)(?=\u003c\\?(?![^?]*\\?\u003e))",
+          "end": "(?!\\G)(\\s*$\\n)?",
+          "patterns": [
+            {
+              "name": "meta.embedded.block.php",
+              "contentName": "source.php",
+              "begin": "\u003c\\?(?i:php|=)?",
+              "end": "(\\?)\u003e",
+              "patterns": [
+                {
+                  "include": "#language"
+                }
+              ],
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.begin.php"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                },
+                "1": {
+                  "name": "source.php"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.whitespace.embedded.leading.php"
+            }
           },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.whitespace.embedded.trailing.php"
+            }
+          }
+        },
+        {
+          "name": "meta.embedded.block.php",
+          "contentName": "source.php",
+          "begin": "\u003c\\?(?i:php|=)?(?![^?]*\\?\u003e)",
+          "end": "(\\?)\u003e",
           "patterns": [
             {
               "include": "#language"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            },
+            "1": {
+              "name": "source.php"
+            }
+          }
+        },
+        {
+          "name": "meta.embedded.line.php",
+          "begin": "\u003c\\?(?i:php|=)?",
+          "end": "\u003e",
+          "patterns": [
+            {
+              "name": "meta.special.empty-tag.php",
+              "match": "\\G(\\s*)((\\?))(?=\u003e)",
+              "captures": {
+                "1": {
+                  "name": "source.php"
+                },
+                "2": {
+                  "name": "punctuation.section.embedded.end.php"
+                },
+                "3": {
+                  "name": "source.php"
+                }
+              }
+            },
+            {
+              "contentName": "source.php",
+              "begin": "\\G",
+              "end": "(\\?)(?=\u003e)",
+              "patterns": [
+                {
+                  "include": "#language"
+                }
+              ],
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.section.embedded.end.php"
+                },
+                "1": {
+                  "name": "source.php"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.begin.php"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.embedded.end.php"
+            }
+          }
         }
       ]
     }
-  },
-  "scopeName": "text.html.php",
-  "uuid": "22986475-8CA5-11D9-AEDD-000D93C8BE28"
-}
+  }
+}