Squiz/DoubleQuoteUsage: Use original string when testing and fixing double quotes

If a string contains tabs, they were previously replaced by spaces while that is not the responsibility of this sniff.

Author: jrfnl

src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php

@@ -49,15 +49,27 @@ public function process(File $phpcsFile, $stackPtr)
  return;
  }
 
- $workingString = $tokens[$stackPtr]['content'];
+ // If tabs are being converted to spaces by the tokeniser, the
+ // original content should be used instead of the converted content.
+ if (isset($tokens[$stackPtr]['orig_content']) === true) {
+ $workingString = $tokens[$stackPtr]['orig_content'];
+ } else {
+ $workingString = $tokens[$stackPtr]['content'];
+ }
+
  $lastStringToken = $stackPtr;
 
  $i = ($stackPtr + 1);
  if (isset($tokens[$i]) === true) {
  while ($i < $phpcsFile->numTokens
  && $tokens[$i]['code'] === $tokens[$stackPtr]['code']
  ) {
- $workingString .= $tokens[$i]['content'];
+ if (isset($tokens[$i]['orig_content']) === true) {
+ $workingString .= $tokens[$i]['orig_content'];
+ } else {
+ $workingString .= $tokens[$i]['content'];
+ }
+
  $lastStringToken = $i;
  $i++;
  }

src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc

@@ -29,6 +29,9 @@ $string = "\123 \234"."\u123"."\e";
 echo "window.location = \"".$url."\";\n";
 echo ""
 
+$string = "Hello
+there";
+
 function test() {
  echo "It Worked';
 }

src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc.fixed

@@ -29,6 +29,9 @@ $string = "\123 \234"."\u123"."\e";
 echo 'window.location = "'.$url."\";\n";
 echo ''
 
+$string = 'Hello
+there';
+
 function test() {
  echo "It Worked';
 }

src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php

@@ -38,6 +38,7 @@ public function getErrorList()
  22 => 1,
  29 => 1,
  30 => 1,
+ 32 => 1,
  );
 
  }//end getErrorList()