NoSuperfluousConcatenationFixer - fix for "$" being at the end of string on the left of concatenation operator. (#347)

Author: kubawerlos

README.md

@@ -8,7 +8,7 @@
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=master&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)
 [![Code coverage](https://img.shields.io/coveralls/github/kubawerlos/php-cs-fixer-custom-fixers/master.svg)](https://coveralls.io/github/kubawerlos/php-cs-fixer-custom-fixers?branch=master)
-![Tests](https://img.shields.io/badge/tests-2292-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-2297-brightgreen.svg)
 [![Mutation testing badge](https://badge.stryker-mutator.io/github.com/kubawerlos/php-cs-fixer-custom-fixers/master)](https://stryker-mutator.github.io)
 [![Psalm type coverage](https://shepherd.dev/github/kubawerlos/php-cs-fixer-custom-fixers/coverage.svg)](https://shepherd.dev/github/kubawerlos/php-cs-fixer-custom-fixers)
 

src/Fixer/NoSuperfluousConcatenationFixer.php

@@ -160,18 +160,22 @@ private function fixConcat(Tokens $tokens, int $firstIndex, int $secondIndex): v
  [
  new Token(
  [T_CONSTANT_ENCAPSED_STRING,
- $prefix . $border . $this->getContentForBorder($firstContent, $border) . $this->getContentForBorder($secondContent, $border) . $border,
+ $prefix . $border . $this->getContentForBorder($firstContent, $border, true) . $this->getContentForBorder($secondContent, $border, false) . $border,
  ]
  ),
  ]
  );
  }
 
- private function getContentForBorder(string $content, string $targetBorder): string
+ private function getContentForBorder(string $content, string $targetBorder, bool $escapeDollarWhenIsLastCharacter): string
  {
  $currentBorder = $content[0];
  $content = \substr($content, 1, -1);
  if ($currentBorder === '"') {
+ if ($escapeDollarWhenIsLastCharacter && $content[\strlen($content) - 1] === '$') {
+ $content = \substr($content, 0, -1) . '\$';
+ }
+
  return $content;
  }
  if ($targetBorder === "'") {

tests/Fixer/NoSuperfluousConcatenationFixerTest.php

@@ -177,6 +177,31 @@ public static function provideFixCases(): iterable
  ['allow_preventing_trailing_spaces' => true],
  ];
 
+ yield [
+ '<?php echo "My name is \$foo";',
+ '<?php echo "My name is $" . "foo";',
+ ];
+
+ yield [
+ '<?php echo "My name is \$foo";',
+ '<?php echo "My name is $" . \'foo\';',
+ ];
+
+ yield [
+ '<?php echo "My name is \$foo";',
+ '<?php echo \'My name is $\' . "foo";',
+ ];
+
+ yield [
+ '<?php echo \'My name is $foo\';',
+ '<?php echo \'My name is $\' . \'foo\';',
+ ];
+
+ yield [
+ '<?php echo "one \$two \$three $";',
+ '<?php echo "one $" . "two $" . "three $";',
+ ];
+
  for ($bytevalue = 0; $bytevalue < 256; $bytevalue++) {
  $char = \chr($bytevalue);
  yield [