Fix promoted default values (#672)

* Fix FieldsBuilder ignoring promoted properties' default values * Add test for promoted default value * Fix code style * Fix code style
thecodingmachine · Apr 1, 2024 · 02c6131 · 02c6131
1 parent 59048a1
commit 02c6131
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/FieldsBuilder.php b/src/FieldsBuilder.php
@@ -170,7 +170,7 @@ public function getInputFields(string $className, string $inputName, bool $isUpd
         $reflectorByFields = [];
 
         $inputFields = [];
-        $defaultProperties = $refClass->getDefaultProperties();
+        $defaultProperties = $this->getClassDefaultProperties($refClass);
 
         $closestMatchingTypeClass = null;
         $parent = get_parent_class($refClass->getName());
@@ -1143,4 +1143,20 @@ private function getClassConstructParameterNames(ReflectionClass $refClass): arr
 
         return $names;
     }
+
+    /** @return array<string, mixed> */
+    private function getClassDefaultProperties(ReflectionClass $refClass): array
+    {
+        $properties = $refClass->getDefaultProperties();
+
+        foreach ($refClass->getConstructor()?->getParameters() ?? [] as $parameter) {
+            if (! $parameter->isPromoted() || ! $parameter->isDefaultValueAvailable()) {
+                continue;
+            }
+
+            $properties[$parameter->getName()] = $parameter->getDefaultValue();
+        }
+
+        return $properties;
+    }
 }
diff --git a/tests/Fixtures/Integration/Controllers/ArticleController.php b/tests/Fixtures/Integration/Controllers/ArticleController.php
@@ -41,6 +41,7 @@ public function updateArticle(UpdateArticleInput $input): Article
     {
         $article = new Article('test');
         $article->magazine = $input->magazine;
+        $article->summary = $input->summary;
 
         return $article;
     }

diff --git a/tests/Fixtures/Integration/Models/UpdateArticleInput.php b/tests/Fixtures/Integration/Models/UpdateArticleInput.php
@@ -13,6 +13,7 @@ public function __construct(
         #[Field]
         #[Security("magazine != 'NYTimes'")]
         public readonly string|null $magazine,
+        public readonly string $summary = 'default',
     )
     {
     }

diff --git a/tests/Integration/EndToEndTest.php b/tests/Integration/EndToEndTest.php
@@ -1911,6 +1911,7 @@ public function testEndToEndInputConstructor(): void
                 magazine: "Test"
             }) {
                 magazine
+                summary
             }
         }
         ';
@@ -1922,6 +1923,7 @@ public function testEndToEndInputConstructor(): void
 
         $data = $this->getSuccessResult($result);
         $this->assertSame('Test', $data['updateArticle']['magazine']);
+        $this->assertSame('default', $data['updateArticle']['summary']);
         $queryString = '
         mutation {
             updateArticle(input: {