From f21a01c2f9f4873edb66aa834ecb563beb7d97f5 Mon Sep 17 00:00:00 2001
From: Grundik <grundik@ololo.cc>
Date: Tue, 16 May 2023 22:12:57 +0300
Subject: [PATCH] Nullable flag on constructor property promotion, closes #183

Signed-off-by: Grundik <grundik@ololo.cc>
---
 src/Generator/ParameterGenerator.php          |  8 ++++++
 src/Generator/PromotedParameterGenerator.php  |  5 ++++
 src/Generator/TypeGenerator.php               |  8 ++++++
 .../PromotedParameterGeneratorTest.php        | 25 +++++++++++++++++++
 .../TestAsset/ClassWithPromotedProperties.php | 18 +++++++++++++
 5 files changed, 64 insertions(+)
 create mode 100644 test/Generator/PromotedParameterGeneratorTest.php
 create mode 100644 test/TestAsset/ClassWithPromotedProperties.php

diff --git a/src/Generator/ParameterGenerator.php b/src/Generator/ParameterGenerator.php
index 48434ab4..2787fc98 100644
--- a/src/Generator/ParameterGenerator.php
+++ b/src/Generator/ParameterGenerator.php
@@ -167,6 +167,14 @@ public function getType()
             : null;
     }
 
+    /**
+     * @return ?TypeGenerator
+     */
+    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..0b6b4c9a 100644
--- a/src/Generator/PromotedParameterGenerator.php
+++ b/src/Generator/PromotedParameterGenerator.php
@@ -87,6 +87,11 @@ public static function fromParameterGeneratorWithVisibility(ParameterGenerator $
             );
         }
 
+        $typeObject = $generator->getTypeObject();
+        if ($typeObject&& $typeObject->getNullable()) {
+            $type = '?' . $type;
+        }
+
         return new self(
             $name,
             $type,
diff --git a/src/Generator/TypeGenerator.php b/src/Generator/TypeGenerator.php
index 0d7fc532..819d436d 100644
--- a/src/Generator/TypeGenerator.php
+++ b/src/Generator/TypeGenerator.php
@@ -140,6 +140,14 @@ public function __toString(): string
         return $this->type->toString();
     }
 
+    /**
+     * @return bool Nullable flag
+     */
+    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..ff7bbbc1
--- /dev/null
+++ b/test/Generator/PromotedParameterGeneratorTest.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Code\Generator;
+
+use Laminas\Code\Generator\PromotedParameterGenerator;
+use Laminas\Code\Reflection\ParameterReflection;
+use LaminasTest\Code\TestAsset\ClassWithPromotedProperties;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\TestCase;
+
+#[Group('Laminas_Code_Generator')]
+#[Group('Laminas_Code_Generator_Php')]
+class PromotedParameterGeneratorTest extends TestCase
+{
+    public function testfromParameterGeneratorWithVisibility(): void
+    {
+        $parameterReflection = new ParameterReflection([ClassWithPromotedProperties::class, '__construct'], 0);
+
+        $generator = PromotedParameterGenerator::fromReflection($parameterReflection);
+
+        $this->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 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Code\TestAsset;
+
+/**
+ * Class with a promoted constructor properties
+ *
+ * @license MIT
+ */
+class ClassWithPromotedProperties
+{
+    public function __construct(
+        protected ?int $nullable
+    ) {
+    }
+}