[PropertyInfo] Update List Information from ReflectionExtractor

symfony · Dec 14, 2015 · b2da76c · b2da76c
1 parent afc6ee4
commit b2da76c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -62,9 +62,13 @@ public function getProperties($class, array $context = array())
 
         foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflectionMethod) {
             $propertyName = $this->getPropertyName($reflectionMethod->name);
-            if ($propertyName) {
-                $properties[$propertyName] = true;
+            if (!$propertyName || isset($properties[$propertyName])) {
+                continue;
             }
+            if (!preg_match('/^[A-Z]{2,}/', $propertyName)) {
+                $propertyName = lcfirst($propertyName);
+            }
+            $properties[$propertyName] = true;
         }
 
         return array_keys($properties);

diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -36,18 +36,19 @@ public function testGetProperties()
                 'bal',
                 'parent',
                 'collection',
+                'B',
                 'foo',
                 'foo2',
                 'foo3',
                 'foo4',
                 'foo5',
                 'files',
-                'A',
-                'B',
-                'C',
-                'D',
-                'E',
-                'F',
+                'a',
+                'DOB',
+                'c',
+                'd',
+                'e',
+                'f',
             ),
             $this->extractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );

diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -46,6 +46,11 @@ class Dummy extends ParentDummy
      */
     public $collection;
 
+    /**
+     * @var ParentDummy
+     */
+    public $B;
+
     /**
      * A.
      *
@@ -63,4 +68,13 @@ public function getA()
     public function setB(ParentDummy $parent = null)
     {
     }
+
+    /**
+     * Date of Birth.
+     *
+     * @return \DateTime
+     */
+    public function getDOB()
+    {
+    }
 }