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

…ttps://github.com/jrfnl/PHP_CodeSniffer
squizlabs · May 17, 2021 · 293aa66 · 293aa66
2 parents fde816c + f6d4010
commit 293aa66
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/package.xml b/package.xml
@@ -577,6 +577,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <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" />
+        <file baseinstalldir="PHP/CodeSniffer" name="ExecutableFileUnitTest.3.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="ExecutableFileUnitTest.4.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ExecutableFileUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineHTMLUnitTest.1.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="InlineHTMLUnitTest.2.inc" role="test" />

diff --git a/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php b/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php
@@ -23,7 +23,10 @@ class ExecutableFileSniff 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/ExecutableFileUnitTest.3.inc b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.3.inc
@@ -0,0 +1 @@
+<?= 'text' ?>
diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.4.inc b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.4.inc
@@ -0,0 +1 @@
+<?= 'text' ?>
diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
@@ -44,6 +44,7 @@ public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'ExecutableFileUnitTest.2.inc':
+        case 'ExecutableFileUnitTest.4.inc':
             return [1 => 1];
         default:
             return [];