Allow closing tags in files containing HTML

Summary: Ref T8742. PHP files which contain inline HTML should be allowed to use PHP closing tags (`?>`). This is in accordance with [[https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md | PSR-2 guidelines]]. Test Plan: Updated unit tests. Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: Korvin Maniphest Tasks: T8742 Differential Revision: https://secure.phabricator.com/D13794
newint33h · Aug 5, 2015 · 402899a · 402899a
1 parent fb5d5b8
commit 402899a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
@@ -2,4 +2,3 @@
 
 This shouldn't fatal the parser.
 ~~~~~~~~~~
-error:1:10
diff --git a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test
@@ -4,7 +4,6 @@ garbage garbage
 ?>
 ~~~~~~~~~~
 error:1:1
-error:4:1
 ~~~~~~~~~~
 garbage garbage
 <?php

diff --git a/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php
@@ -10,6 +10,12 @@ public function getLintName() {
   }
 
   public function process(XHPASTNode $root) {
+    $inline_html = $root->selectDescendantsOfType('n_INLINE_HTML');
+
+    if ($inline_html) {
+      return;
+    }
+
     foreach ($root->selectTokensOfType('T_CLOSE_TAG') as $token) {
       $this->raiseLintAtToken(
         $token,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@

		This shouldn't fatal the parser.
		~~~~~~~~~~
		error:1:10