PromotedConstructorPropertyFixer - fix for variadic parameters (#768)

Author: kubawerlos

README.md

@@ -3,7 +3,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-3410-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3413-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/workflows/CI/badge.svg?branch=main)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Analyzer/Analysis/ConstructorAnalysis.php

@@ -74,7 +74,7 @@ public function getConstructorPromotableParameters(): array
 
             $typeIndex = $this->tokens->getPrevMeaningfulToken($index);
             \assert(\is_int($typeIndex));
-            if ($this->tokens[$typeIndex]->equalsAny(['(', ',', [\T_CALLABLE]])) {
+            if ($this->tokens[$typeIndex]->equalsAny(['(', ',', [\T_CALLABLE], [\T_ELLIPSIS]])) {
                 continue;
             }
 

tests/Analyzer/Analysis/ConstructorAnalysisTest.php

@@ -105,13 +105,20 @@ public function __construct($noType1, $noType2, int $i, $noType3) {}
             }',
         ];
 
-        yield 'callable is not supported' => [
+        yield 'callable is not promotable' => [
             [15 => '$a', 20 => '$b', 35 => '$i'],
             '<?php class Foo {
                 public function __construct(array $a, bool $b, callable $c1, CALLABLE $c1, int $i) {}
             }',
         ];
 
+        yield 'variadic parameter is not promotable' => [
+            [15 => '$x', 20 => '$y'],
+            '<?php class Foo {
+                public function __construct(int $x, int $y, int ...$z) {}
+            }',
+        ];
+
         if (\PHP_VERSION_ID >= 80000) {
             yield 'some already promoted' => [
                 [22 => '$b', 39 => '$s'],

tests/Fixer/PromotedConstructorPropertyFixerTest.php

@@ -72,6 +72,24 @@ public function __construct(int $x);
             ',
         ];
 
+        yield 'do not promote with callable type' => [
+            '<?php class Foo {
+                public function __construct(callable $x) {
+                    $this->x = $x;
+                }
+            }
+            ',
+        ];
+
+        yield 'do not promote variadic parameter' => [
+            '<?php class Foo {
+                public function __construct(int ...$x) {
+                    $this->x = $x;
+                }
+            }
+            ',
+        ];
+
         yield 'do not promote when types of property and parameter are different' => [
             '<?php class Foo {
                 private int $x;
@@ -690,23 +708,23 @@ public function __construct(string $y) {
 
         yield 'do not promote with different name when new one is already used' => [
             '<?php class Foo {
-                private string $x;
+                private int $x;
                 public function __construct(
-                    callable $x,
-                    string $y,
-                    private string $z,
+                    int $x,
+                    int $y,
+                    private int $z,
                 ) {
                     $this->x = $y;
                 }
             }
             ',
             '<?php class Foo {
-                private string $x;
-                private string $z;
+                private int $x;
+                private int $z;
                 public function __construct(
-                    callable $x,
-                    string $y,
-                    string $z,
+                    int $x,
+                    int $y,
+                    int $z,
                 ) {
                     $this->x = $y;
                     $this->z = $z;