PHP: Class names at the start of a string are now highlighted correctly (#2731)

Some class names at the start of the input string were not detected correctly due to the way greedy matching works. This fixes the issue by splitting the `class-name` rule into two rules, one before and one after the `keyword` rule that interfered and caused the issue.

Author: TomPavelec

components/prism-php.js

@@ -33,6 +33,11 @@
 				'punctuation': /\\/
 			}
 		},
+		'class-name-definition': {
+			pattern: /(\b(?:class|interface|trait)\s+)\b[a-z_]\w*(?!\\)\b/i,
+			lookbehind: true,
+			alias: 'class-name'
+		},
 		'keyword': [
 			{
 				pattern: /(\(\s*)\b(?:bool|boolean|int|integer|float|string|object|array)\b(?=\s*\))/i,
@@ -85,7 +90,7 @@
 		'argument-name': /\b[a-z_]\w*(?=\s*:(?!:))/i,
 		'class-name': [
 			{
-				pattern: /(\b(?:class|interface|extends|implements|trait|instanceof|new(?!\s+self|\s+static))\s+|\bcatch\s*\()\b[a-z_]\w*(?!\\)\b/i,
+				pattern: /(\b(?:extends|implements|instanceof|new(?!\s+self|\s+static))\s+|\bcatch\s*\()\b[a-z_]\w*(?!\\)\b/i,
 				greedy: true,
 				lookbehind: true
 			},

components/prism-php.min.js

@@ -224,7 +224,7 @@ function main() {}
         ["delimiter", "]"]
     ]],
     ["keyword", "class"],
-    ["class-name", "Foo"],
+    ["class-name-definition", "Foo"],
     ["punctuation", "{"],
     ["keyword", "public"],
     ["keyword", "function"],

tests/languages/php/attribute_feature.test

@@ -170,7 +170,7 @@ class Foo extends \Package\Bar implements App\Baz {}
 	["punctuation", "}"],
 
 	["keyword", "class"],
-	["class-name", "Foo"],
+	["class-name-definition", "Foo"],
 	["keyword", "extends"],
 	["class-name", "Bar"],
 	["keyword", "implements"],
@@ -179,7 +179,7 @@ class Foo extends \Package\Bar implements App\Baz {}
 	["punctuation", "}"],
 
 	["keyword", "class"],
-	["class-name", "Foo"],
+	["class-name-definition", "Foo"],
 	["keyword", "extends"],
 	["class-name", [
 		["punctuation", "\\"],

tests/languages/php/class-name_feature.test

@@ -0,0 +1,21 @@
+class First {}
+class Second {}
+
+----------------------------------------------------
+
+[
+	["keyword", "class"],
+	["class-name-definition", "First"],
+	["punctuation", "{"],
+	["punctuation", "}"],
+
+	["keyword", "class"],
+	["class-name-definition", "Second"],
+	["punctuation", "{"],
+	["punctuation", "}"]
+]
+
+
+----------------------------------------------------
+
+Checks for issue #2614.