fixed VariableInDoubleQuotedStringSniff doesn't detect multiple variables in quotes

added fixer for sniff

Author: xalopp

Sniffs/Strings/VariableInDoubleQuotedStringSniff.php

@@ -59,39 +59,47 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         $matches = array();
 
-        if (preg_match_all($varRegExp, $content, $matches, PREG_OFFSET_CAPTURE) !== 1) {
+        if (preg_match_all($varRegExp, $content, $matches, PREG_OFFSET_CAPTURE) === 0) {
             return;
         }
 
         foreach ($matches as $match) {
-            list($var, $pos) = $match[0];
+            foreach ($match as $info) {
+                list($var, $pos) = $info;
 
-            if ($pos === 1 || $content[$pos - 1] !== '{') {
-                // look for backslashes
-                if ($content[$pos - 1] === "\\") {
-                    $bsPos = $pos - 1;
+                if ($pos === 1 || $content[$pos - 1] !== '{') {
+                    // look for backslashes
+                    if ($content[$pos - 1] === "\\") {
+                        $bsPos = $pos - 1;
 
-                    while ($content[$bsPos] === "\\") {
-                        $bsPos--;
-                    }
+                        while ($content[$bsPos] === "\\") {
+                            $bsPos--;
+                        }
 
-                    if ((($pos - 1 - $bsPos) % 2) === 1) {
-                        continue;
+                        if ((($pos - 1 - $bsPos) % 2) === 1) {
+                            continue;
+                        }
                     }
-                }
-
-                $phpcsFile->addError(
-                    sprintf(
-                        'must surround variable %s with { }',
-                        $var
-                    ),
-                    $stackPtr
-                );
-                continue;
-            }
 
+                    $fix = $phpcsFile->addFixableError(
+                        sprintf(
+                            'must surround variable %s with { }',
+                            $var
+                        ),
+                        $stackPtr
+                    );
 
+                    if ($fix) {
+                        $before     = substr($content, 0, $pos);
+                        $after      = substr($content, $pos + strlen($var));
+                        $newContent = $before . "{" . $var . "}" . $after;
 
+                        $phpcsFile->fixer->beginChangeset();
+                        $phpcsFile->fixer->replaceToken($stackPtr, $newContent);
+                        $phpcsFile->fixer->endChangeset();
+                    }
+                }
+            }
         }
     }
 }

Tests/Strings/VariableInDoubleQuotedStringUnitTest.fail.inc

@@ -2,8 +2,8 @@
 
 $a = "$a";
 $a = "\\\\$a";
-$a = "blafasel $a";
-$b = "blafasel \\$a";
+$a = "blafasel $a $b";
+$b = "blafasel \\$a$b";
 $d = "blafasel $$a";
 $d = "blafasel $_a";
 $f = "100$missing needed";

Tests/Strings/VariableInDoubleQuotedStringUnitTest.fail.inc.fixed

@@ -0,0 +1,9 @@
+<?php
+
+$a = "{$a}";
+$a = "\\\\{$a}";
+$a = "blafasel {$a} {$b}";
+$b = "blafasel \\{$a}{$b}";
+$d = "blafasel ${$a}";
+$d = "blafasel {$_a}";
+$f = "100{$missing} needed";

Tests/Strings/VariableInDoubleQuotedStringUnitTest.php

@@ -48,8 +48,8 @@ protected function getErrorList($testFile = '')
             return array(
                 3 => 1,
                 4 => 1,
-                5 => 1,
-                6 => 1,
+                5 => 2,
+                6 => 2,
                 7 => 1,
                 8 => 1,
                 9 => 1,