[PropertyInfo] Respect property name case when guessing from public method name

antograssiot · antograssiot · commit 843bb76f8ac0 · 2019-10-11T06:14:16.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -103,8 +103,8 @@ public function getProperties($class, array $context = [])
             if (!$propertyName || isset($properties[$propertyName])) {
                 continue;
             }
-            if (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName)) {
-                $propertyName = lcfirst($propertyName);
+            if ($reflectionClass->hasProperty($lowerCasedPropertyName = lcfirst($propertyName)) || (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName))) {
+                $propertyName = $lowerCasedPropertyName;
             }
             $properties[$propertyName] = $propertyName;
         }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -59,6 +59,8 @@ public function testGetProperties()
                 '123',
                 'self',
                 'realParent',
+                'xTotals',
+                'YT',
                 'c',
                 'd',
                 'e',
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -93,6 +93,16 @@ class Dummy extends ParentDummy
      */
     public $j;
 
+    /**
+     * @var array
+     */
+    private $xTotals;
+
+    /**
+     * @var string
+     */
+    private $YT;
+
     /**
      * This should not be removed.
      *
@@ -166,4 +176,18 @@ public function setSelf(self $self)
     public function setRealParent(parent $realParent)
     {
     }
+
+    /**
+     * @return array
+     */
+    public function getXTotals()
+    {
+    }
+
+    /**
+     * @return string
+     */
+    public function getYT()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ public function getProperties($class, array $context = [])`
`103`	`103`	`if (!$propertyName \|\| isset($properties[$propertyName])) {`
`104`	`104`	`continue;`
`105`	`105`	`}`
`106`		`- if (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName)) {`
`107`		`- $propertyName = lcfirst($propertyName);`
	`106`	`+ if ($reflectionClass->hasProperty($lowerCasedPropertyName = lcfirst($propertyName)) \|\| (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName))) {`
	`107`	`+ $propertyName = $lowerCasedPropertyName;`
`108`	`108`	`}`
`109`	`109`	`$properties[$propertyName] = $propertyName;`
`110`	`110`	`}`