Add support for arrow functions

Author: wouterj

src/Templates/highlight.php/php.json

@@ -20,7 +20,7 @@
                     "end": "\\)",
                     "keywords": "true false null new array",
                     "contains": {
-                        "$ref": "#contains.10.contains.1.contains"
+                        "$ref": "#contains.10.contains.3.contains"
                     }
                 }
             ]
@@ -154,17 +154,21 @@
                             "_": "variable"
                         },
                         {
-                            "$ref": "#contains.10.contains.1.contains.2",
+                            "$ref": "#contains.10.contains.3.contains.2",
                             "_": "comment"
                         },
                         {
-                            "$ref": "#contains.10.contains.1.contains.3",
+                            "$ref": "#contains.10.contains.3.contains.3",
                             "_": "string"
                         },
                         {
-                            "$ref": "#contains.10.contains.1.contains.4",
+                            "$ref": "#contains.10.contains.3.contains.4",
                             "_": "number"
                         },
+                        {
+                            "$ref": "#contains.10",
+                            "_": "closure"
+                        },
                         {
                             "$ref": "#contains.9",
                             "_": "invoke"
@@ -175,16 +179,23 @@
         },
         {
             "className": "function",
-            "beginKeywords": "function",
+            "beginKeywords": "fn function",
             "end": "[;{]",
             "excludeEnd": true,
             "illegal": "\\$|\\[|%",
             "contains": [
+                {
+                    "beginKeywords": "use"
+                },
                 {
                     "className": "title",
                     "begin": "[a-zA-Z_]\\w*",
                     "relevance": 0
                 },
+                {
+                    "begin": "=>",
+                    "endsParent": true
+                },
                 {
                     "className": "params",
                     "begin": "\\(",
@@ -319,10 +330,10 @@
             "begin": "=>"
         },
         {
-            "$ref": "#contains.10.contains.1.contains.3"
+            "$ref": "#contains.10.contains.3.contains.3"
         },
         {
-            "$ref": "#contains.10.contains.1.contains.4"
+            "$ref": "#contains.10.contains.3.contains.4"
         }
     ]
 }

tests/fixtures/expected/blocks/code-blocks/php.html

@@ -85,7 +85,7 @@
 
     <span class="hljs-keyword">return</span> <span class="hljs-keyword">new</span> <span class="hljs-title invoke__">UserBadge</span>(
         <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>payload</span>-&gt;<span class="hljs-title invoke__">getUserId</span>(),
-        <span class="hljs-function"><span class="hljs-keyword">fn</span> <span class="hljs-params">(<span class="hljs-keyword">string</span> <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>)</span>: <span class="hljs-title">User</span></span> =&gt; <span class="hljs-keyword">new</span> <span class="hljs-title invoke__">User</span>(<span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>, <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>payload</span>-&gt;<span class="hljs-title invoke__">getRoles</span>())
+        <span class="hljs-function"><span class="hljs-keyword">fn</span> <span class="hljs-params">(<span class="hljs-keyword">string</span> <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>)</span>: <span class="hljs-title">User</span> =&gt;</span> <span class="hljs-keyword">new</span> <span class="hljs-title invoke__">User</span>(<span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>userIdentifier</span>, <span class="hljs-variable"><span class="hljs-variable-other-marker">$</span>payload</span>-&gt;<span class="hljs-title invoke__">getRoles</span>())
     );
 
     <span class="hljs-comment">// or</span>