Merge branch 'feature/psr2-endfilenewline-add-fixed-file' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

package.xml

@@ -1047,15 +1047,21 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="ClosingTagUnitTest.6.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ClosingTagUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.1.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.1.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.2.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.3.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.3.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.4.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.5.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.6.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.7.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.8.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.9.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.9.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.10.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.10.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.php" role="test" />
        </dir>
        <dir name="Methods">

src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php

@@ -57,7 +57,7 @@ public function process(File $phpcsFile, $stackPtr)
             $error = 'Expected 1 newline at end of file; 0 found';
             $fix   = $phpcsFile->addFixableError($error, $lastToken, 'NoneFound');
             if ($fix === true) {
-                $phpcsFile->fixer->addNewline($lastToken);
+                $phpcsFile->fixer->addContent($lastToken, "\n");
             }
 
             $phpcsFile->recordMetric($stackPtr, 'Number of newlines at EOF', '0');
@@ -90,7 +90,7 @@ public function process(File $phpcsFile, $stackPtr)
                     $phpcsFile->fixer->replaceToken($i, '');
                 }
 
-                $phpcsFile->fixer->replaceToken($lastToken, $phpcsFile->eolChar);
+                $phpcsFile->fixer->replaceToken($lastToken, "\n");
                 $phpcsFile->fixer->endChangeset();
             }
         }

src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.1.inc.fixed

@@ -0,0 +1,2 @@
+<?php
+echo 'foo';

src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.10.inc.fixed

@@ -0,0 +1,2 @@
+<?php
+/** Why me?

src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.3.inc.fixed

@@ -0,0 +1,2 @@
+<?php
+echo 'foo';

src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.6.inc.fixed

@@ -0,0 +1,2 @@
+<?php
+echo 'foo';  

src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.7.inc.fixed

@@ -0,0 +1,2 @@
+<?php
+echo 'foo';

src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.9.inc.fixed

@@ -0,0 +1,2 @@
+<?php
+/** Why me?