Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.1.inc.fixed" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.2.inc" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.2.inc.fixed" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.3.inc" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.3.inc.fixed" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.js" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.js.fixed" role="test" />
<file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.php" role="test" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ public function process(File $phpcsFile, $stackPtr)
T_DOC_COMMENT_WHITESPACE => true,
T_DOC_COMMENT_STRING => true,
T_COMMENT => true,
T_END_HEREDOC => true,
T_END_NOWDOC => true,
];

for ($i = 0; $i < $phpcsFile->numTokens; $i++) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

$heredoc = <<<"END"
a
b
c
END;

$nowdoc = <<<'END'
a
b
c
END;
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

$heredoc = <<<"END"
a
b
c
END;

$nowdoc = <<<'END'
a
b
c
END;
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function getErrorList($testFile='')
92 => 1,
93 => 1,
];
break;

case 'DisallowTabIndentUnitTest.2.inc':
return [
6 => 1,
Expand All @@ -96,23 +96,33 @@ public function getErrorList($testFile='')
13 => 1,
19 => 1,
];
break;

case 'DisallowTabIndentUnitTest.3.inc':
if (\PHP_VERSION_ID >= 70300) {
return [
7 => 1,
13 => 1,
];
}

// PHP 7.2 or lower: PHP version which doesn't support flexible heredocs/nowdocs yet.
return [];

case 'DisallowTabIndentUnitTest.js':
return [
3 => 1,
5 => 1,
6 => 1,
];
break;

case 'DisallowTabIndentUnitTest.css':
return [
1 => 1,
2 => 1,
];
break;

default:
return [];
break;
}//end switch

}//end getErrorList()
Expand Down