diff --git a/src/Generator/ParameterGenerator.php b/src/Generator/ParameterGenerator.php index 48434ab4..496d125b 100644 --- a/src/Generator/ParameterGenerator.php +++ b/src/Generator/ParameterGenerator.php @@ -167,6 +167,15 @@ public function getType() : null; } + /** + * @return ?TypeGenerator + * @psalm-pure + */ + public function getTypeObject() + { + return $this->type; + } + /** * @param string $name * @return ParameterGenerator diff --git a/src/Generator/PromotedParameterGenerator.php b/src/Generator/PromotedParameterGenerator.php index 56cd02cf..f24729cc 100644 --- a/src/Generator/PromotedParameterGenerator.php +++ b/src/Generator/PromotedParameterGenerator.php @@ -87,6 +87,10 @@ public static function fromParameterGeneratorWithVisibility(ParameterGenerator $ ); } + if ($generator->getTypeObject() && $generator->getTypeObject()->getNullable()) { + $type = '?' . $type; + } + return new self( $name, $type, diff --git a/src/Generator/TypeGenerator.php b/src/Generator/TypeGenerator.php index 0d7fc532..d30284fa 100644 --- a/src/Generator/TypeGenerator.php +++ b/src/Generator/TypeGenerator.php @@ -140,6 +140,15 @@ public function __toString(): string return $this->type->toString(); } + /** + * @return bool Nullable flag + * @psalm-pure + */ + public function getNullable() + { + return $this->nullable; + } + /** * @return bool[]|string[] ordered tuple, first key represents whether the type is nullable, second is the * trimmed string diff --git a/test/Generator/PromotedParameterGeneratorTest.php b/test/Generator/PromotedParameterGeneratorTest.php new file mode 100644 index 00000000..7d2a9eca --- /dev/null +++ b/test/Generator/PromotedParameterGeneratorTest.php @@ -0,0 +1,25 @@ +assertSame('protected ?int $nullable', $generator->generate()); + } +} diff --git a/test/TestAsset/ClassWithPromotedProperties.php b/test/TestAsset/ClassWithPromotedProperties.php new file mode 100644 index 00000000..4d932d3c --- /dev/null +++ b/test/TestAsset/ClassWithPromotedProperties.php @@ -0,0 +1,18 @@ +