Support more complex concatenations

Author: kubawerlos

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-3737-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3738-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/TypedClassConstantFixer.php

@@ -23,7 +23,7 @@ final class TypedClassConstantFixer extends AbstractFixer
 {
     private const INTEGER_KINDS = [\T_LNUMBER, '+', '-', '*', '(', ')', \T_POW, \T_SL, \T_SR];
     private const FLOAT_KINDS = [\T_DNUMBER, ...self::INTEGER_KINDS, '/'];
-    private const STRING_KINDS = [\T_CONSTANT_ENCAPSED_STRING, '.', \T_LNUMBER, \T_DNUMBER];
+    private const STRING_KINDS = [\T_CONSTANT_ENCAPSED_STRING, \T_LNUMBER, \T_DNUMBER];
 
     public function getDefinition(): FixerDefinitionInterface
     {
@@ -144,33 +144,36 @@ private static function getTypeOfExpression(Tokens $tokens, int $index): string
      */
     private static function getTypeOfExpressionForTokenKinds(array $tokenKinds): string
     {
-        if (self::hasExclusivelyKinds($tokenKinds, self::INTEGER_KINDS)) {
+        if (self::isOfTypeBasedOnKinds($tokenKinds, self::INTEGER_KINDS)) {
             return 'int';
         }
 
-        if (self::hasExclusivelyKinds($tokenKinds, self::FLOAT_KINDS)) {
+        if (self::isOfTypeBasedOnKinds($tokenKinds, self::FLOAT_KINDS)) {
             return 'float';
         }
 
-        if (self::hasExclusivelyKinds($tokenKinds, self::STRING_KINDS)) {
+        if (self::isOfTypeBasedOnKinds($tokenKinds, self::STRING_KINDS, '.')) {
             return 'string';
         }
 
         return 'mixed';
     }
 
     /**
-     * @param list<int|string> $tokenKinds
+     * @param list<int|string> $expressionTokenKinds
      * @param list<int|string> $expectedKinds
      */
-    private static function hasExclusivelyKinds(array $tokenKinds, array $expectedKinds): bool
+    private static function isOfTypeBasedOnKinds(array $expressionTokenKinds, array $expectedKinds, ?string $instantWinner = null): bool
     {
-        foreach ($tokenKinds as $index => $tokenKind) {
-            if (\in_array($tokenKind, $expectedKinds, true)) {
-                unset($tokenKinds[$index]);
+        foreach ($expressionTokenKinds as $index => $expressionTokenKind) {
+            if ($expressionTokenKind === $instantWinner) {
+                return true;
+            }
+            if (\in_array($expressionTokenKind, $expectedKinds, true)) {
+                unset($expressionTokenKinds[$index]);
             }
         }
 
-        return $tokenKinds === [];
+        return $expressionTokenKinds === [];
     }
 }

tests/Fixer/TypedClassConstantFixerTest.php

@@ -125,11 +125,16 @@ public static function provideFixCases(): iterable
             "<?php class Foo { public const BAR = 'John Doe'; }",
         ];
 
-        yield 'string as result of concatenation' => [
+        yield 'string as result of concatenations' => [
             '<?php class Foo { public const string BAR = "A" . 1 . "B" . 0.25 . "C"; }',
             '<?php class Foo { public const BAR = "A" . 1 . "B" . 0.25 . "C"; }',
         ];
 
+        yield 'string as result of concatenation with other constant' => [
+            '<?php class Foo { public const string BAR = "A" . Baz::C; }',
+            '<?php class Foo { public const BAR = "A" . Baz::C; }',
+        ];
+
         yield 'multiple constants' => [
             <<<'PHP'
                 <?php