Skip to content

PSR2/NamespaceDeclaration: do not enforce new line in inline HTML #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PSR2/NamespaceDeclaration: do not enforce new line in inline HTML #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public function process(File $phpcsFile, $stackPtr)

$end = $phpcsFile->findEndOfStatement($stackPtr);
for ($i = ($end + 1); $i < ($phpcsFile->numTokens - 1); $i++) {
if ($tokens[$i]['code'] === T_CLOSE_TAG) {
// Don't enforce new line if the next thing after the statement is a PHP close tag.
return;
}

if ($tokens[$i]['line'] === $tokens[$end]['line']) {
continue;
}
Expand Down
7 changes: 7 additions & 0 deletions src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,10 @@ namespace Vendor\Package;
$call = namespace\function_name();
echo namespace\CONSTANT_NAME;
// Something which is not a blank line.

// When the next thing after a namespace declaration is a PHP close tag, don't enforce a new line as it may impact HTML display.
namespace Vendor\NoBlankLine\EndsOnCloseTag ?>
<?php
namespace Vendor\HasBlankLine\EndsOnSemiColonPlusCloseTag; ?>

<?php
7 changes: 7 additions & 0 deletions src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.inc.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,10 @@ namespace Vendor\Package;
$call = namespace\function_name();
echo namespace\CONSTANT_NAME;
// Something which is not a blank line.

// When the next thing after a namespace declaration is a PHP close tag, don't enforce a new line as it may impact HTML display.
namespace Vendor\NoBlankLine\EndsOnCloseTag ?>
<?php
namespace Vendor\HasBlankLine\EndsOnSemiColonPlusCloseTag; ?>

<?php
Loading