PHP: Fixed closing tag issue (#1652)

This fixes that PHP's closing tag (`?>`) was detected inside strings and comments.

components/prism-php.js

@@ -35,11 +35,14 @@
 		}
 	});
 
-	Prism.languages.insertBefore('php', 'keyword', {
+	Prism.languages.insertBefore('php', 'comment', {
 		'delimiter': {
-			pattern: /\?>|<\?(?:php|=)?/i,
+			pattern: /\?>$|^<\?(?:php(?=\s)|=)?/i,
 			alias: 'important'
-		},
+		}
+	});
+
+	Prism.languages.insertBefore('php', 'keyword', {
 		'variable': /\$+(?:\w+\b|(?={))/i,
 		'package': {
 			pattern: /(\\|namespace\s+|use\s+)[\w\\]+/,
@@ -114,16 +117,16 @@
 	delete Prism.languages.php['string'];
 
 	Prism.hooks.add('before-tokenize', function(env) {
-		if (!/(?:<\?php|<\?)/ig.test(env.code)) {
+		if (!/<\?/.test(env.code)) {
 			return;
 		}
 
-		var phpPattern = /(?:<\?php|<\?)[\s\S]*?(?:\?>|$)/ig;
+		var phpPattern = /<\?(?:[^"'/#]|\/(?![*/])|("|')(?:\\[\s\S]|(?!\1)[^\\])*\1|(?:\/\/|#)(?:[^?\n\r]|\?(?!>))*|\/\*[\s\S]*?(?:\*\/|$))*?(?:\?>|$)/ig;
 		Prism.languages['markup-templating'].buildPlaceholders(env, 'php', phpPattern);
 	});
 
 	Prism.hooks.add('after-tokenize', function(env) {
 		Prism.languages['markup-templating'].tokenizePlaceholders(env, 'php');
 	});
 
-}(Prism));
+}(Prism));

tests/languages/markup+php/issue1582.test

@@ -0,0 +1,23 @@
+<?php
+
+	echo '<?xml version="1.0" encoding="UTF-8"?><tracker />';
+	echo PHP_EOL;
+
+----------------------------------------------------
+
+[
+	["php", [
+		["delimiter", "<?php"],
+		["keyword", "echo"],
+		["single-quoted-string", "'<?xml version=\"1.0\" encoding=\"UTF-8\"?><tracker />'"],
+		["punctuation", ";"],
+		["keyword", "echo"],
+		["constant", "PHP_EOL"],
+		["punctuation", ";"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for PHP closing tags '?>' inside of strings.
+See #1582 for details.

tests/languages/markup+php/php_with_closing_tag_in_markup_feature.test

@@ -0,0 +1,44 @@
+<?php
+
+	// '
+	# "
+	//*
+	echo '?>' + "?>"; /* ?> */
+	echo PHP_EOL;
+	// */
+	// ?>
+
+<?php # ?>
+
+----------------------------------------------------
+
+[
+	["php", [
+		["delimiter", "<?php"],
+		["comment", "// '"],
+		["shell-comment", "# \""],
+		["comment", "//*"],
+		["keyword", "echo"],
+		["single-quoted-string", "'?>'"],
+		["operator", "+"],
+		["double-quoted-string", ["\"?>\""]],
+		["punctuation", ";"],
+		["comment", "/* ?> */"],
+		["keyword", "echo"],
+		["constant", "PHP_EOL"],
+		["punctuation", ";"],
+		["comment", "// */"],
+		["comment", "// "],
+		["delimiter", "?>"]
+	]],
+
+	["php", [
+		["delimiter", "<?php"],
+		["shell-comment", "# "],
+		["delimiter", "?>"]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for PHP closing tags '?>' inside of strings and comments.

tests/languages/php/delimiter_feature.test

@@ -1,6 +1,6 @@
 <? ?>
 <?php ?>
-<?= ?>
+<?= // ?>
 
 ----------------------------------------------------
 
@@ -15,10 +15,11 @@
 	]],
 	["php", [
 		["delimiter", "<?="],
+		["comment", "// "],
 		["delimiter", "?>"]
 	]]
 ]
 
 ----------------------------------------------------
 
-Checks for delimiters.
+Checks for delimiters.