jenkins-bot has submitted this change and it was merged. Change subject: CharacterBeforePHPOpeningTagSniff: Support T_HASHBANG for HHVM >=3.5,<3.7 ......................................................................
CharacterBeforePHPOpeningTagSniff: Support T_HASHBANG for HHVM >=3.5,<3.7 token_get_all() in HHVM >=3.5,<3.7 will interpret a hashbang as T_HASHBANG rather than T_INLINE_HTML like PHP5. This has been fixed upstream in <https://github.com/facebook/hhvm/pull/5023>, but we need to support 3.6.0. Bug: T103119 Change-Id: Iac4745580bae313505af370d6361c800f5587f5a --- M MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Polybuildr: Looks good to me, approved jenkins-bot: Verified diff --git a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php index a27df2b..e8a419d 100644 --- a/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php +++ b/MediaWiki/Sniffs/ExtraCharacters/CharacterBeforePHPOpeningTagSniff.php @@ -31,7 +31,8 @@ // so the first token is on the first line // check if it is valid shebang - if ( $tokens[0]['type'] == 'T_INLINE_HTML' + // T_HASHBANG is a token used in HHVM >=3.5, <3.7 (T103119) + if ( in_array( $tokens[0]['type'], array( 'T_INLINE_HTML', 'T_HASHBANG' ) ) && substr( $tokens[0]['content'], 0, 2 ) == '#!' ) { $validShebang = true; } -- To view, visit https://gerrit.wikimedia.org/r/219394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac4745580bae313505af370d6361c800f5587f5a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/codesniffer Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Polybuildr <v.a.ghai...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
