Follow up to #978 (#985)

Author: kubawerlos

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG for PHP CS Fixer: custom fixers
 
 ## v3.22.0
+- NoSuperfluousConcatenationFixer - add option "keep_concatenation_for_different_quotes"
 - NoPhpStormGeneratedCommentFixer - handle more comments
 - Update minimum PHP CS Fixer version to 3.59.0
 

README.md

@@ -5,7 +5,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3545-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3547-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml/badge.svg)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions/workflows/ci.yaml)

src/Fixer/NoSuperfluousConcatenationFixer.php

@@ -94,28 +94,19 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            $firstIndex = $tokens->getPrevMeaningfulToken($index);
-            \assert(\is_int($firstIndex));
-
-            if (!$tokens[$firstIndex]->isGivenKind(\T_CONSTANT_ENCAPSED_STRING)) {
-                continue;
-            }
-            if (!$this->areOnlyHorizontalWhitespacesBetween($tokens, $firstIndex, $index)) {
+            $firstIndex = $this->getFirstIndex($tokens, $index);
+            if ($firstIndex === null) {
                 continue;
             }
 
-            $secondIndex = $tokens->getNextMeaningfulToken($index);
-            \assert(\is_int($secondIndex));
-
-            if (!$tokens[$secondIndex]->isGivenKind(\T_CONSTANT_ENCAPSED_STRING)) {
-                continue;
-            }
-            if (!$this->areOnlyHorizontalWhitespacesBetween($tokens, $index, $secondIndex)) {
+            $secondIndex = $this->getSecondIndex($tokens, $index);
+            if ($secondIndex === null) {
                 continue;
             }
+
             if (
                 $this->keepConcatenationForDifferentQuotes
-                && substr($tokens[$firstIndex]->getContent(), 0, 1) !== substr($tokens[$secondIndex]->getContent(), 0, 1)
+                && \substr($tokens[$firstIndex]->getContent(), 0, 1) !== \substr($tokens[$secondIndex]->getContent(), 0, 1)
             ) {
                 continue;
             }
@@ -124,6 +115,36 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
         }
     }
 
+    private function getFirstIndex(Tokens $tokens, int $index): ?int
+    {
+        $firstIndex = $tokens->getPrevMeaningfulToken($index);
+        \assert(\is_int($firstIndex));
+
+        if (!$tokens[$firstIndex]->isGivenKind(\T_CONSTANT_ENCAPSED_STRING)) {
+            return null;
+        }
+        if (!$this->areOnlyHorizontalWhitespacesBetween($tokens, $firstIndex, $index)) {
+            return null;
+        }
+
+        return $firstIndex;
+    }
+
+    private function getSecondIndex(Tokens $tokens, int $index): ?int
+    {
+        $secondIndex = $tokens->getNextMeaningfulToken($index);
+        \assert(\is_int($secondIndex));
+
+        if (!$tokens[$secondIndex]->isGivenKind(\T_CONSTANT_ENCAPSED_STRING)) {
+            return null;
+        }
+        if (!$this->areOnlyHorizontalWhitespacesBetween($tokens, $index, $secondIndex)) {
+            return null;
+        }
+
+        return $secondIndex;
+    }
+
     private function areOnlyHorizontalWhitespacesBetween(Tokens $tokens, int $indexStart, int $indexEnd): bool
     {
         for ($index = $indexStart + 1; $index < $indexEnd; $index++) {

tests/Fixer/NoSuperfluousConcatenationFixerTest.php

@@ -186,10 +186,26 @@ public static function provideFixCases(): iterable
             ['allow_preventing_trailing_spaces' => true],
         ];
 
-        yield 'option for leaving double-quoted string and single-quoted string concatendated' => [
+        yield 'option for leaving double-quoted string and single-quoted string concatenated' => [
             '\'abc\'."def"',
             null,
-            ['keep_concatenation_for_different_quotes' => true]
+            ['keep_concatenation_for_different_quotes' => true],
+        ];
+
+        yield 'keep concatenation for different quotes and merge others' => [
+            <<<'CONTENT'
+                "ab";
+                "c" . 'd';
+                'e' . "f";
+                'gh';
+                CONTENT,
+            <<<'CONTENT'
+                "a" . "b";
+                "c" . 'd';
+                'e' . "f";
+                'g' . 'h';
+                CONTENT,
+            ['keep_concatenation_for_different_quotes' => true],
         ];
 
         yield 'dollar as last character in double quotes merged with double quotes' => [