Merge pull request #574 from deguif/promoted-properties

Handle properly promoted constructor properties default values
schmittjoh · Jan 30, 2023 · 9250ed8 · 9250ed8
2 parents 619e880 + 6b69940
commit 9250ed8
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Translation/Extractor/File/ValidationExtractor.php b/Translation/Extractor/File/ValidationExtractor.php
@@ -168,7 +168,7 @@ private function extractFromConstraints(array $constraints)
         foreach ($constraints as $constraint) {
             $ref = new \ReflectionClass($constraint);
             $defaultValues = $ref->getDefaultProperties();
-
+            $defaultParameters = null !== $ref->getConstructor() ? $ref->getConstructor()->getParameters() : [];
             $properties = $ref->getProperties();
 
             foreach ($properties as $property) {
@@ -177,9 +177,18 @@ private function extractFromConstraints(array $constraints)
                 // If the property ends with 'Message'
                 if (strtolower(substr($propName, -1 * strlen('Message'))) === 'message') {
                     // If it is different from the default value
-                    if ($defaultValues[$propName] !== $constraint->{$propName}) {
+                    if (array_key_exists($propName, $defaultValues) && $defaultValues[$propName] !== $constraint->{$propName}) {
                         $message = new Message($constraint->{$propName}, 'validators');
                         $this->catalogue->add($message);
+                    } elseif (method_exists($property, 'isPromoted') && $property->isPromoted()) {
+                        foreach ($defaultParameters as $defaultParameter) {
+                            if ($defaultParameter->getName() === $propName && $defaultParameter->isDefaultValueAvailable() && $defaultParameter->getDefaultValue() !== $constraint->{$propName}) {
+                                $message = new Message($constraint->{$propName}, 'validators');
+                                $this->catalogue->add($message);
+
+                                break;
+                            }
+                        }
                     }
                 }
             }