Support complex arrays

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

@@ -144,15 +144,19 @@ private static function getTypeOfExpression(Tokens $tokens, int $index): string
      */
     private static function getTypeOfExpressionForTokenKinds(array $tokenKinds): string
     {
-        if (self::isOfTypeBasedOnKinds($tokenKinds, self::INTEGER_KINDS)) {
+        if (self::isOfTypeBasedOnKinds($tokenKinds, [], [\T_ARRAY, CT::T_ARRAY_SQUARE_BRACE_OPEN])) {
+            return 'array';
+        }
+
+        if (self::isOfTypeBasedOnKinds($tokenKinds, self::INTEGER_KINDS, [])) {
             return 'int';
         }
 
-        if (self::isOfTypeBasedOnKinds($tokenKinds, self::FLOAT_KINDS)) {
+        if (self::isOfTypeBasedOnKinds($tokenKinds, self::FLOAT_KINDS, [])) {
             return 'float';
         }
 
-        if (self::isOfTypeBasedOnKinds($tokenKinds, self::STRING_KINDS, '.')) {
+        if (self::isOfTypeBasedOnKinds($tokenKinds, self::STRING_KINDS, ['.'])) {
             return 'string';
         }
 
@@ -162,11 +166,18 @@ private static function getTypeOfExpressionForTokenKinds(array $tokenKinds): str
     /**
      * @param list<int|string> $expressionTokenKinds
      * @param list<int|string> $expectedKinds
+     * @param list<int|string> $instantWinners
      */
-    private static function isOfTypeBasedOnKinds(array $expressionTokenKinds, array $expectedKinds, ?string $instantWinner = null): bool
-    {
+    private static function isOfTypeBasedOnKinds(
+        array $expressionTokenKinds,
+        array $expectedKinds,
+        array $instantWinners,
+    ): bool {
         foreach ($expressionTokenKinds as $index => $expressionTokenKind) {
-            if ($expressionTokenKind === $instantWinner) {
+            if ($expressionTokenKind === '?') {
+                return false;
+            }
+            if (\in_array($expressionTokenKind, $instantWinners, true)) {
                 return true;
             }
             if (\in_array($expressionTokenKind, $expectedKinds, true)) {

tests/Fixer/TypedClassConstantFixerTest.php

@@ -55,6 +55,16 @@ public static function provideFixCases(): iterable
             '<?php class Foo { public const BAR = [1 => 2] + array(3 => 4) + [5 => 6]; }',
         ];
 
+        yield 'array as sum of long syntax array and constant' => [
+            '<?php class Foo { public const array BAR = Baz::C + array(1); }',
+            '<?php class Foo { public const BAR = Baz::C + array(1); }',
+        ];
+
+        yield 'array as sum of short syntax array and constant' => [
+            '<?php class Foo { public const array BAR = Baz::C1 + [2] + Baz::C2; }',
+            '<?php class Foo { public const BAR = Baz::C1 + [2] + Baz::C2; }',
+        ];
+
         yield 'false' => [
             '<?php class Foo { public const false BAR = false; }',
             '<?php class Foo { public const BAR = false; }',