feature PHP-CS-Fixer#1267 SingleQuoteFixer fix more use cases (SpaceP…

…ossum)

This PR was squashed before being merged into the 1.10 branch (closes PHP-CS-Fixer#1267).

Discussion
----------

SingleQuoteFixer fix more use cases

This helps fixing more use cases for the single quote fixer.

For example:
```php
<?php $a = "foo \$bar5";
```
```php
<?php $a = 'foo $bar5';
```

Commits
-------

3cc7907 SingleQuoteFixer fix more use cases

Symfony/CS/Fixer/Symfony/SingleQuoteFixer.php

@@ -35,12 +35,13 @@ public function fix(\SplFileInfo $file, $content)
             if (
                 '"' === $content[0] &&
                 false === strpos($content, "'") &&
-                // regex: odd number of backslashes, not followed by double quote
-                !preg_match('/(?<!\\\\)(?:\\\\{2})*\\\\(?!["\\\\])/', $content, $m)
+                // regex: odd number of backslashes, not followed by double quote or dollar
+                !preg_match('/(?<!\\\\)(?:\\\\{2})*\\\\(?!["$\\\\])/', $content, $m)
             ) {
                 $content = substr($content, 1, -1);
                 $content = str_replace('\\"', '"', $content);
-                $token->setContent("'".$content."'");
+                $content = str_replace('\\$', '$', $content);
+                $token->setContent('\''.$content.'\'');
             }
         }
 

Symfony/CS/Tests/Fixer/Symfony/SingleQuoteFixerTest.php

@@ -58,7 +58,19 @@ public function provideTestFixCases()
 <?php $a = "\\foo\\bar\\\\";
 EOF
             ),
-
+            array(
+                '<?php $a = \'foo $bar7\';',
+                '<?php $a = "foo \$bar7";',
+            ),
+            array(
+                '<?php $a = \'foo $(bar7)\';',
+                '<?php $a = "foo \$(bar7)";',
+            ),
+            array(
+                '<?php $a = \'foo \\\\($bar8)\';',
+                '<?php $a = "foo \\\\(\$bar8)";',
+            ),
+            array('<?php $a = "foo \\" \\$$bar";'),
             array('<?php $a = \'foo bar\';'),
             array('<?php $a = \'foo "bar"\';'),
             array('<?php $a = "foo \'bar\'";'),