bug #16090 Fix PropertyAccessor modifying array in object when array key does no… (pierredup)

fabpot · fabpot · commit 58bf83002029 · 2015-10-05T09:23:57.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- Fix PropertyAccessor modifying array in object when array key does no… | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16056 | License | MIT | Doc PR | Commits ------- f24c678 Fix PropertyAccessor modifying array in object when array key does not exist
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -118,7 +118,9 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr
                     (is_array($objectOrArray) && !array_key_exists($property, $objectOrArray))
                 )
             ) {
-                $objectOrArray[$property] = $i + 1 < $propertyPath->getLength() ? array() : null;
+                if ($i + 1 < $propertyPath->getLength()) {
+                    $objectOrArray[$property] = array();
+                }
             }
 
             if ($isIndex) {
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -103,6 +103,15 @@ public function testGetValueReadsProperty()
         $this->assertEquals('Bernhard', $this->propertyAccessor->getValue($object, 'firstName'));
     }
 
+    public function testGetValueNotModifyObject()
+    {
+        $object = new Author();
+        $object->firstName = array('Bernhard');
+
+        $this->assertNull($this->propertyAccessor->getValue($object, 'firstName[1]'));
+        $this->assertSame(array('Bernhard'), $object->firstName);
+    }
+
     public function testGetValueIgnoresSingular()
     {
         $this->markTestSkipped('This feature is temporarily disabled as of 2.1');

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr`
`118`	`118`	`(is_array($objectOrArray) && !array_key_exists($property, $objectOrArray))`
`119`	`119`	`)`
`120`	`120`	`) {`
`121`		`- $objectOrArray[$property] = $i + 1 < $propertyPath->getLength() ? array() : null;`
	`121`	`+ if ($i + 1 < $propertyPath->getLength()) {`
	`122`	`+ $objectOrArray[$property] = array();`
	`123`	`+ }`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`if ($isIndex) {`