Merge branch 'feature/generic-endfilenewline-check-short-echo-tag' of h…

…ttps://github.com/jrfnl/PHP_CodeSniffer
ktomk · May 17, 2021 · c475208 · c475208
2 parents e73bc0f + db1a0a7
commit c475208
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 1 deletion.
diff --git a/package.xml b/package.xml
@@ -553,6 +553,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.5.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.8.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.1.css" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNoNewlineUnitTest.1.css.fixed" role="test" />

diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php
@@ -34,7 +34,10 @@ class EndFileNewlineSniff implements Sniff
      */
     public function register()
     {
-        return [T_OPEN_TAG];
+        return [
+            T_OPEN_TAG,
+            T_OPEN_TAG_WITH_ECHO,
+        ];
 
     }//end register()
 

diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.6.inc b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.6.inc
@@ -0,0 +1 @@
+<?= 'foo';
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.6.inc.fixed b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.6.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo';
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.7.inc b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.7.inc
@@ -0,0 +1 @@
+<?= 'foo' ?>
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.7.inc.fixed b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.7.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo' ?>
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.8.inc b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.8.inc
@@ -0,0 +1 @@
+<?= 'foo' ?>
diff --git a/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php
@@ -33,6 +33,9 @@ public function getErrorList($testFile='')
         case 'EndFileNewlineUnitTest.3.css':
         case 'EndFileNewlineUnitTest.4.inc':
             return [2 => 1];
+        case 'EndFileNewlineUnitTest.6.inc':
+        case 'EndFileNewlineUnitTest.7.inc':
+            return [1 => 1];
         default:
             return [];
         }//end switch