Skip to content

Commit c475208

Browse files
committed
Merge branch 'feature/generic-endfilenewline-check-short-echo-tag' of https://github.com/jrfnl/PHP_CodeSniffer
2 parents e73bc0f + db1a0a7 commit c475208

8 files changed

+17
-1
lines changed

package.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
553553
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc" role="test" />
554554
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc.fixed" role="test" />
555555
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.5.inc" role="test" />
556+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc" role="test" />
557+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc.fixed" role="test" />
558+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc" role="test" />
559+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc.fixed" role="test" />
560+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.8.inc" role="test" />
556561
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.php" role="test" />
557562
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.1.css" role="test" />
558563
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.1.css.fixed" role="test" />

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ class EndFileNewlineSniff 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/EndFileNewlineUnitTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public function getErrorList($testFile='')
3333
case 'EndFileNewlineUnitTest.3.css':
3434
case 'EndFileNewlineUnitTest.4.inc':
3535
return [2 => 1];
36+
case 'EndFileNewlineUnitTest.6.inc':
37+
case 'EndFileNewlineUnitTest.7.inc':
38+
return [1 => 1];
3639
default:
3740
return [];
3841
}//end switch

0 commit comments

Comments
 (0)