Merge branch 'feature/generic-disallowtabindent-check-short-echo-tag' of https://github.com/jrfnl/PHP_CodeSniffer

gsherwood · gsherwood · commit 6be01f605012 · 2021-05-17T14:08:30.000+10:00
diff --git a/package.xml b/package.xml
@@ -773,8 +773,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.css" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.css.fixed" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.inc" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.1.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.1.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.2.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.2.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.js" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.php" role="test" />
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
@@ -41,7 +41,10 @@ class DisallowTabIndentSniff 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/WhiteSpace/DisallowTabIndentUnitTest.1.inc b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.1.inc
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.1.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.1.inc.fixed
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.2.inc b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.2.inc
@@ -0,0 +1,19 @@
+<?=
+    "$hello	$there";
+?>
+<html>
+    <head>
+		<title>Foo</title>
+	</head>
+	<body>
+		<div>
+    		<div>
+				<div>
+	    		</div>
+    	    </div>
+        </div>
+    </body>
+</html>
+
+<?=
+	"$hello	$there";
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.2.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.2.inc.fixed
@@ -0,0 +1,19 @@
+<?=
+    "$hello	$there";
+?>
+<html>
+    <head>
+        <title>Foo</title>
+    </head>
+    <body>
+        <div>
+            <div>
+                <div>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
+
+<?=
+    "$hello	$there";
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
@@ -40,10 +40,10 @@ public function setCliValues($testFile, $config)
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='DisallowTabIndentUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'DisallowTabIndentUnitTest.inc':
+        case 'DisallowTabIndentUnitTest.1.inc':
             return [
                 5  => 2,
                 9  => 1,
@@ -84,6 +84,19 @@ public function getErrorList($testFile='DisallowTabIndentUnitTest.inc')
                 93 => 1,
             ];
             break;
+        case 'DisallowTabIndentUnitTest.2.inc':
+            return [
+                6  => 1,
+                7  => 1,
+                8  => 1,
+                9  => 1,
+                10 => 1,
+                11 => 1,
+                12 => 1,
+                13 => 1,
+                19 => 1,
+            ];
+            break;
         case 'DisallowTabIndentUnitTest.js':
             return [
                 3 => 1,
