Merge branch 'feature/generic-endfilenonewline-check-short-echo-tag' of

https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · May 17, 2021 · a1d1f03 · a1d1f03
2 parents c475208 + 1d845a1
commit a1d1f03
Show file tree

Hide file tree

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

diff --git a/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php b/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php
@@ -34,7 +34,10 @@ class EndFileNoNewlineSniff 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/EndFileNoNewlineUnitTest.10.inc b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.10.inc
@@ -0,0 +1 @@
+<?= 'foo'; ?>
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.8.inc b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.8.inc
@@ -0,0 +1 @@
+<?= 'foo';
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.8.inc.fixed b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.8.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo';
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.9.inc b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.9.inc
@@ -0,0 +1 @@
+<?= 'foo'; ?>
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.9.inc.fixed b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.9.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo'; ?>
diff --git a/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php b/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php
@@ -37,6 +37,9 @@ public function getErrorList($testFile='')
         case 'EndFileNoNewlineUnitTest.2.js':
         case 'EndFileNoNewlineUnitTest.6.inc':
             return [2 => 1];
+        case 'EndFileNoNewlineUnitTest.8.inc':
+        case 'EndFileNoNewlineUnitTest.9.inc':
+            return [1 => 1];
         default:
             return [];
         }//end switch