Skip to content

Commit b094c94

Browse files
committed
PSR2/EndFileNewline: check files using only short open echo tag
As per the standard: > All PHP files MUST end with a single blank line This does not exclude files which are mixed PHP/HTML. Includes unit tests.
1 parent ae4f33b commit b094c94

10 files changed

+26
-1
lines changed

package.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,6 +1299,13 @@ http://pear.php.net/dtd/package-2.0.xsd">
12991299
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.9.inc.fixed" role="test" />
13001300
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.10.inc" role="test" />
13011301
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.10.inc.fixed" role="test" />
1302+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.11.inc" role="test" />
1303+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.11.inc.fixed" role="test" />
1304+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.12.inc" role="test" />
1305+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.12.inc.fixed" role="test" />
1306+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.13.inc" role="test" />
1307+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.13.inc.fixed" role="test" />
1308+
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.14.inc" role="test" />
13021309
<file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.php" role="test" />
13031310
</dir>
13041311
<dir name="Methods">

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ class EndFileNewlineSniff implements Sniff
2323
*/
2424
public function register()
2525
{
26-
return [T_OPEN_TAG];
26+
return [
27+
T_OPEN_TAG,
28+
T_OPEN_TAG_WITH_ECHO,
29+
];
2730

2831
}//end register()
2932

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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?= 'foo'
2+
3+
4+
5+
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/PSR2/Tests/Files/EndFileNewlineUnitTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ public function getErrorList($testFile='')
3535
case 'EndFileNewlineUnitTest.9.inc':
3636
case 'EndFileNewlineUnitTest.10.inc':
3737
return [2 => 1];
38+
case 'EndFileNewlineUnitTest.11.inc':
39+
case 'EndFileNewlineUnitTest.12.inc':
40+
case 'EndFileNewlineUnitTest.13.inc':
41+
return [1 => 1];
3842
default:
3943
return [];
4044
}//end switch

0 commit comments

Comments
 (0)