Fixed bug #373 : Double quote usage fix removing too many double quotes

Author: gsherwood

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

@@ -122,7 +122,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         if ($fix === true) {
             $phpcsFile->fixer->beginChangeset();
-            $innerContent = trim($workingString, '"');
+            $innerContent = substr($workingString, 1, -1);
             $innerContent = str_replace('\"', '"', $innerContent);
             $phpcsFile->fixer->replaceToken($stackPtr, "'$innerContent'");
             while ($lastStringToken !== $stackPtr) {

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

@@ -22,4 +22,5 @@ $string = "Hello
 there";
 $string = 'Hello
 there';
-?>
+
+echo "window.location = \"".$url."\";\n";

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

@@ -0,0 +1,26 @@
+<?php
+$string = "Hello\tThere";
+$string = "Hello There\r\n";
+$string = 'Hello There';
+$string = "Hello $there";
+$string = 'Hello'."$there '".'hi';
+$string = "My name is 'Greg'";
+$string = 'Hello'.' There'."\n";
+$string = "Hello There\f";
+$string = "Hello There\b";
+$string = "Hello\vThere";
+$string = "\x0";
+$string = 'Hello '.$there.' Greg';
+$string = "<div class='$class'>";
+$string = "Value: $var[test]";
+$string = "\0";
+
+$x = "bar = '$z',
+baz = '" . $a . "'...$x";
+
+$string = 'Hello
+there';
+$string = 'Hello
+there';
+
+echo 'window.location = "'.$url."\";\n";

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

@@ -52,6 +52,7 @@ public function getErrorList()
                 18 => 1,
                 19 => 1,
                 21 => 1,
+                26 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -62,6 +62,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #371 : Shorthand binary cast causes tokenizer errors
     -- New token T_BINARY_CAST added for the b"string" cast format (the 'b' is the T_BINARY_CAST token)
   - Fixed bug #372 : phpcbf parse problem, wrong brace placement for inline IF
+  - Fixed bug #373 : Double quote usage fix removing too many double quotes
   - Fixed bug #20196 : 1.5.2 breaks scope_closer position
  </notes>
  <contents>
@@ -2066,6 +2067,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>
         <file baseinstalldir="PHP" name="DoubleQuoteUsageUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP" name="DoubleQuoteUsageUnitTest.inc.fixed" role="test" />
         <file baseinstalldir="PHP" name="DoubleQuoteUsageUnitTest.php" role="test">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>