PromotedConstructorPropertyFixer - do not promote when type of property is not nullable and type of parameter is nullable (#1042)

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

@@ -275,11 +275,18 @@ private function typesAllowPromoting(string $propertyType, string $parameterType
             return true;
         }
 
-        if (\substr($propertyType, 0, 1) === '?') {
+        $isPropertyNullable = \substr($propertyType, 0, 1) === '?';
+        $isParameterNullable = \substr($parameterType, 0, 1) === '?';
+
+        if ($isParameterNullable && !$isPropertyNullable) {
+            return false;
+        }
+
+        if ($isPropertyNullable) {
             $propertyType = \substr($propertyType, 1);
         }
 
-        if (\substr($parameterType, 0, 1) === '?') {
+        if ($isParameterNullable) {
             $parameterType = \substr($parameterType, 1);
         }
 

tests/Fixer/PromotedConstructorPropertyFixerTest.php

@@ -100,6 +100,16 @@ public function __construct(string $x) {
             ',
         ];
 
+        yield 'do not promote when type of property is not nullable and type of parameter is nullable' => [
+            '<?php class Foo {
+                private int $x;
+                public function __construct(?int $x) {
+                    $this->x = $x;
+                }
+            }
+            ',
+        ];
+
         yield 'do not promote when not simple assignment' => [
             '<?php class Foo {
                 private int $x;
@@ -919,7 +929,8 @@ public function __construct(int $x, int $y, int $z, bool $condition)
 
         yield 'promote nullable types' => [
             '<?php class Foo {
-                public function __construct(private ?int $x, private ?int $y, private ?int $z)
+                private int $z;
+                public function __construct(private ?int $x, private ?int $y, ?int $z)
                 {
                 }
             }
@@ -932,7 +943,6 @@ public function __construct(int $x, ?int $y, ?int $z)
                 {
                     $this->x = $x;
                     $this->y = $y;
-                    $this->z = $z;
                 }
             }
             ',