Skip to content

Commit a1d1f03

Browse files
committed
Merge branch 'feature/generic-endfilenonewline-check-short-echo-tag' of https://github.com/jrfnl/PHP_CodeSniffer
2 parents c475208 + 1d845a1 commit a1d1f03

8 files changed

+17
-1
lines changed

package.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
579579
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.6.inc" role="test" />
580580
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.6.inc.fixed" role="test" />
581581
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.7.inc" role="test" />
582+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.8.inc" role="test" />
583+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.8.inc.fixed" role="test" />
584+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.9.inc" role="test" />
585+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.9.inc.fixed" role="test" />
586+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.10.inc" role="test" />
582587
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.php" role="test" />
583588
<file baseinstalldir="PHP/CodeSniffer" name="ExecutableFileUnitTest.1.inc" role="test" />
584589
<file baseinstalldir="PHP/CodeSniffer" name="ExecutableFileUnitTest.2.inc" role="test" />

src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ class EndFileNoNewlineSniff implements Sniff
3434
*/
3535
public function register()
3636
{
37-
return [T_OPEN_TAG];
37+
return [
38+
T_OPEN_TAG,
39+
T_OPEN_TAG_WITH_ECHO,
40+
];
3841

3942
}//end register()
4043

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?= 'foo'; ?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?= 'foo';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?= 'foo';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?= 'foo'; ?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<?= 'foo'; ?>

src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function getErrorList($testFile='')
3737
case 'EndFileNoNewlineUnitTest.2.js':
3838
case 'EndFileNoNewlineUnitTest.6.inc':
3939
return [2 => 1];
40+
case 'EndFileNoNewlineUnitTest.8.inc':
41+
case 'EndFileNoNewlineUnitTest.9.inc':
42+
return [1 => 1];
4043
default:
4144
return [];
4245
}//end switch

0 commit comments

Comments
 (0)