PHP: Added missing PHP 7.4 fn keyword (#2858)

danon · web-flow · commit e0ee93f138b7 · 2021-04-14T15:23:06.000+02:00
diff --git a/components/prism-php.js b/components/prism-php.js
@@ -112,7 +112,7 @@
 				//
 				// keywords cannot be preceded by "->"
 				// the complex lookbehind means `(?<!(?:->|::)\s*)`
-				pattern: /((?:^|[^\s>:]|(?:^|[^-])>|(?:^|[^:]):)\s*)\b(?:__halt_compiler|abstract|and|array|as|break|callable|case|catch|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|namespace|match|new|or|parent|print|private|protected|public|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield)\b/i,
+				pattern: /((?:^|[^\s>:]|(?:^|[^-])>|(?:^|[^:]):)\s*)\b(?:__halt_compiler|abstract|and|array|as|break|callable|case|catch|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|fn|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|namespace|match|new|or|parent|print|private|protected|public|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield)\b/i,
 				lookbehind: true
 			}
 		],
diff --git a/components/prism-php.min.js b/components/prism-php.min.js
diff --git a/tests/languages/php/keyword_feature.test b/tests/languages/php/keyword_feature.test
@@ -30,6 +30,7 @@ exit
 extends;
 final
 finally
+fn
 for
 foreach
 function
@@ -109,6 +110,7 @@ yield from
 	["keyword", "extends"], ["punctuation", ";"],
 	["keyword", "final"],
 	["keyword", "finally"],
+	["keyword", "fn"],
 	["keyword", "for"],
 	["keyword", "foreach"],
 	["keyword", "function"],

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@`
`112`	`112`	`//`
`113`	`113`	`// keywords cannot be preceded by "->"`
`114`	`114`	// the complex lookbehind means `(?<!(?:->\|::)\s*)`
`115`		- pattern: /((?:^\|[^\s>:]\|(?:^\|[^-])>\|(?:^\|[^:]):)\s*)\b(?:__halt_compiler\|abstract\|and\|array\|as\|break\|callable\|case\|catch\|clone\|const\|continue\|declare\|default\|die\|do\|echo\|else\|elseif\|empty\|enddeclare\|endfor\|endforeach\|endif\|endswitch\|endwhile\|enum\|eval\|exit\|extends\|final\|finally\|for\|foreach\|function\|global\|goto\|if\|implements\|include\|include_once\|instanceof\|insteadof\|interface\|isset\|list\|namespace\|match\|new\|or\|parent\|print\|private\|protected\|public\|require\|require_once\|return\|self\|static\|switch\|throw\|trait\|try\|unset\|use\|var\|while\|xor\|yield)\b/i,
	`115`	+ pattern: /((?:^\|[^\s>:]\|(?:^\|[^-])>\|(?:^\|[^:]):)\s*)\b(?:__halt_compiler\|abstract\|and\|array\|as\|break\|callable\|case\|catch\|clone\|const\|continue\|declare\|default\|die\|do\|echo\|else\|elseif\|empty\|enddeclare\|endfor\|endforeach\|endif\|endswitch\|endwhile\|enum\|eval\|exit\|extends\|final\|finally\|fn\|for\|foreach\|function\|global\|goto\|if\|implements\|include\|include_once\|instanceof\|insteadof\|interface\|isset\|list\|namespace\|match\|new\|or\|parent\|print\|private\|protected\|public\|require\|require_once\|return\|self\|static\|switch\|throw\|trait\|try\|unset\|use\|var\|while\|xor\|yield)\b/i,
`116`	`116`	`lookbehind: true`
`117`	`117`	`}`
`118`	`118`	`],`