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

gsherwood · gsherwood · commit e04ecd07397d · 2021-05-17T14:07:47.000+10:00
diff --git a/package.xml b/package.xml
@@ -766,6 +766,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.1.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.2.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.2.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.3.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.3.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.js" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowSpaceIndentUnitTest.php" role="test" />
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php
@@ -41,7 +41,10 @@ class DisallowSpaceIndentSniff 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/DisallowSpaceIndentUnitTest.3.inc b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.3.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/DisallowSpaceIndentUnitTest.3.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.3.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/DisallowSpaceIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php
@@ -86,6 +86,17 @@ public function getErrorList($testFile='DisallowSpaceIndentUnitTest.1.inc')
                 118 => 1,
             ];
             break;
+        case 'DisallowSpaceIndentUnitTest.3.inc':
+            return [
+                2  => 1,
+                5  => 1,
+                10 => 1,
+                12 => 1,
+                13 => 1,
+                14 => 1,
+                15 => 1,
+            ];
+            break;
         case 'DisallowSpaceIndentUnitTest.js':
             return [3 => 1];
             break;
