bug #22265 Allow Upper Case property names (insekticid)

fabpot · fabpot · commit 247e79755055 · 2017-04-04T08:07:48.000-07:00
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #22265). Discussion ---------- Allow Upper Case property names ReflectionExtractor::getProperties() returns $id instead of $Id. It is bad naming convention, but is possible ``` class Entity { protected $Id; public function getId() { return $this->Id; } } ``` | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | no | License | MIT api-platform/core#1026 Commits ------- 2fe1631 Allow Upper Case property names
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -76,7 +76,7 @@ public function getProperties($class, array $context = array())
             if (!$propertyName || isset($properties[$propertyName])) {
                 continue;
             }
-            if (!preg_match('/^[A-Z]{2,}/', $propertyName)) {
+            if (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName)) {
                 $propertyName = lcfirst($propertyName);
             }
             $properties[$propertyName] = true;
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractors/ReflectionExtractorTest.php
@@ -38,6 +38,7 @@ public function testGetProperties()
                 'parent',
                 'collection',
                 'B',
+                'Guid',
                 'g',
                 'foo',
                 'foo2',
@@ -47,6 +48,7 @@ public function testGetProperties()
                 'files',
                 'a',
                 'DOB',
+                'Id',
                 'c',
                 'd',
                 'e',
@@ -129,6 +131,10 @@ public function testIsReadable()
         $this->assertTrue($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'd', array()));
         $this->assertFalse($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'e', array()));
         $this->assertFalse($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'f', array()));
+        $this->assertTrue($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'Id', array()));
+        $this->assertTrue($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'id', array()));
+        $this->assertTrue($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'Guid', array()));
+        $this->assertFalse($this->extractor->isReadable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'guid', array()));
     }
 
     public function testIsWritable()
@@ -142,5 +148,8 @@ public function testIsWritable()
         $this->assertFalse($this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'd', array()));
         $this->assertTrue($this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'e', array()));
         $this->assertTrue($this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'f', array()));
+        $this->assertFalse($this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'Id', array()));
+        $this->assertTrue($this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'Guid', array()));
+        $this->assertFalse($this->extractor->isWritable('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy', 'guid', array()));
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -51,6 +51,16 @@ class Dummy extends ParentDummy
      */
     public $B;
 
+    /**
+     * @var int
+     */
+    protected $Id;
+
+    /**
+     * @var string
+     */
+    public $Guid;
+
     /**
      * Nullable array.
      *
@@ -99,4 +109,11 @@ public function setB(ParentDummy $parent = null)
     public function getDOB()
     {
     }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function getProperties($class, array $context = array())`
`76`	`76`	`if (!$propertyName \|\| isset($properties[$propertyName])) {`
`77`	`77`	`continue;`
`78`	`78`	`}`
`79`		`- if (!preg_match('/^[A-Z]{2,}/', $propertyName)) {`
	`79`	`+ if (!$reflectionClass->hasProperty($propertyName) && !preg_match('/^[A-Z]{2,}/', $propertyName)) {`
`80`	`80`	`$propertyName = lcfirst($propertyName);`
`81`	`81`	`}`
`82`	`82`	`$properties[$propertyName] = true;`