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

Author: gsherwood

.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

package.xml

@@ -590,8 +590,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" />

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()
 

src/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc.fixed renamed to src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc

@@ -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'
+		);
+}

src/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc renamed to src/Standards/Generic/Tests/Files/LineEndingsUnitTest.1.inc.fixed

@@ -0,0 +1,5 @@
+
+<?= 'hi'; ?>
+
+<div>...more HTML...</div>
+<?= 'hi'; ?>

src/Standards/Generic/Tests/Files/LineEndingsUnitTest.2.inc

@@ -0,0 +1,5 @@
+
+<?= 'hi'; ?>
+
+<div>...more HTML...</div>
+<?= 'hi'; ?>