Skip to content

Commit e33c49e

Browse files
committed
Merge branch 'feature/generic-lowercasefilename-check-short-echo-tag' of https://github.com/jrfnl/PHP_CodeSniffer
2 parents 293aa66 + 297e7d3 commit e33c49e

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
600600
<file baseinstalldir="PHP/CodeSniffer" name="LineLengthUnitTest.3.inc" role="test" />
601601
<file baseinstalldir="PHP/CodeSniffer" name="LineLengthUnitTest.4.inc" role="test" />
602602
<file baseinstalldir="PHP/CodeSniffer" name="LineLengthUnitTest.php" role="test" />
603-
<file baseinstalldir="PHP/CodeSniffer" name="LowercasedFilenameUnitTest.inc" role="test" />
603+
<file baseinstalldir="PHP/CodeSniffer" name="LowercasedFilenameUnitTest.1.inc" role="test" />
604+
<file baseinstalldir="PHP/CodeSniffer" name="LowercasedFilenameUnitTest.2.inc" role="test" />
604605
<file baseinstalldir="PHP/CodeSniffer" name="LowercasedFilenameUnitTest.php" role="test" />
605606
<file baseinstalldir="PHP/CodeSniffer" name="OneClassPerFileUnitTest.inc" role="test" />
606607
<file baseinstalldir="PHP/CodeSniffer" name="OneClassPerFileUnitTest.php" role="test" />

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ class LowercasedFilenameSniff 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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?=
2+
3+
?>
4+
5+
<?=
6+
7+
?>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,19 @@ class LowercasedFilenameUnitTest extends AbstractSniffUnitTest
2121
* The key of the array should represent the line number and the value
2222
* should represent the number of errors that should occur on that line.
2323
*
24+
* @param string $testFile The name of the file being tested.
25+
*
2426
* @return array<int, int>
2527
*/
26-
public function getErrorList()
28+
public function getErrorList($testFile='')
2729
{
28-
return [1 => 1];
30+
switch ($testFile) {
31+
case 'LowercasedFilenameUnitTest.1.inc':
32+
case 'LowercasedFilenameUnitTest.2.inc':
33+
return [1 => 1];
34+
default:
35+
return [];
36+
}
2937

3038
}//end getErrorList()
3139

0 commit comments

Comments
 (0)