Skip to content

Commit db1a0a7

Browse files
committed
Generic/EndFileNewline: check files using only short open echo tag
Includes unit tests.
1 parent ae4f33b commit db1a0a7

8 files changed

+17
-1
lines changed

package.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
544544
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc" role="test" />
545545
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc.fixed" role="test" />
546546
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.5.inc" role="test" />
547+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc" role="test" />
548+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc.fixed" role="test" />
549+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc" role="test" />
550+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc.fixed" role="test" />
551+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.8.inc" role="test" />
547552
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.php" role="test" />
548553
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.1.css" role="test" />
549554
<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)