From 002e4ccb9de4e59f3a694a333fb92afe43e0daf3 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Wed, 21 Apr 2021 22:19:25 +0200
Subject: [PATCH] Generic/LineEndings: check files using only short open echo
 tag

Includes unit tests.
---
 .gitattributes                                |  1 +
 package.xml                                   |  6 ++--
 .../Generic/Sniffs/Files/LineEndingsSniff.php |  5 ++-
 ...st.inc.fixed => LineEndingsUnitTest.1.inc} |  0
 ...st.inc => LineEndingsUnitTest.1.inc.fixed} | 36 +++++++++----------
 .../Tests/Files/LineEndingsUnitTest.2.inc     |  5 +++
 .../Files/LineEndingsUnitTest.2.inc.fixed     |  5 +++
 7 files changed, 37 insertions(+), 21 deletions(-)
 rename src/Standards/Generic/Tests/Files/{LineEndingsUnitTest.inc.fixed => LineEndingsUnitTest.1.inc} (100%)
 rename src/Standards/Generic/Tests/Files/{LineEndingsUnitTest.inc => LineEndingsUnitTest.1.inc.fixed} (88%)
 create mode 100644 src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc
 create mode 100644 src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc.fixed

diff --git a/.gitattributes b/.gitattributes
index df3ee2b7f9..2807459b5e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,3 +11,4 @@ scripts/ export-ignore
 # Declare files that should always have CRLF line endings on checkout.
 *WinTest.inc text eol=crlf
 *WinTest.php text eol=crlf
+src/Standards/Generic/Tests/Files/LineEndingsUnitTest*.inc text eol=crlf
diff --git a/package.xml b/package.xml
index c408f94353..d9788071b3 100644
--- a/package.xml
+++ b/package.xml
@@ -579,8 +579,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="InlineHTMLUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.css" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.css.fixed" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.inc" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.1.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.1.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.2.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.2.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.js" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="LineEndingsUnitTest.php" role="test" />
diff --git a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
index 763e7863ca..845e1bcfc4 100644
--- a/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
+++ b/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
@@ -41,7 +41,10 @@ class LineEndingsSniff 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/LineEndingsUnitTest.inc.fixed b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc
similarity index 100%
rename from src/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc.fixed
rename to src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc
diff --git a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc.fixed
similarity index 88%
rename from src/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc
rename to src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc.fixed
index a2d3ed2093..b143fb4cf0 100644
--- a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc
+++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc.fixed
@@ -1,18 +1,18 @@
-
-<?php
-echo 'hi';
-?>
-
-<?php
-echo 'hi';
-?>
-
-<?php
-function foo()
-{
-	$query->group('a.id, 
-			uc.name, 
-			ag.title, 
-			ua.name'
-		);
-}
+
+<?php
+echo 'hi';
+?>
+
+<?php
+echo 'hi';
+?>
+
+<?php
+function foo()
+{
+	$query->group('a.id, 
+			uc.name, 
+			ag.title, 
+			ua.name'
+		);
+}
diff --git a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc
new file mode 100644
index 0000000000..260d7fd2fe
--- /dev/null
+++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc
@@ -0,0 +1,5 @@
+
+<?= 'hi'; ?>
+
+<div>...more HTML...</div>
+<?= 'hi'; ?>
diff --git a/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc.fixed b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc.fixed
new file mode 100644
index 0000000000..260d7fd2fe
--- /dev/null
+++ b/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc.fixed
@@ -0,0 +1,5 @@
+
+<?= 'hi'; ?>
+
+<div>...more HTML...</div>
+<?= 'hi'; ?>