Fix PropertyAccessor modifying array in object when array key does not exist

pierredup · pierredup · commit 255747d2e2f4 · 2015-10-02T23:43:46.000+02:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -113,12 +113,13 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr
             // Create missing nested arrays on demand
             if (
                 $isIndex &&
+                $i + 1 < $propertyPath->getLength()  &&
                 (
                     ($objectOrArray instanceof \ArrayAccess && !isset($objectOrArray[$property])) ||
                     (is_array($objectOrArray) && !array_key_exists($property, $objectOrArray))
                 )
             ) {
-                $objectOrArray[$property] = $i + 1 < $propertyPath->getLength() ? array() : null;
+                $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
`@@ -113,12 +113,13 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr`
`113`	`113`	`// Create missing nested arrays on demand`
`114`	`114`	`if (`
`115`	`115`	`$isIndex &&`
	`116`	`+ $i + 1 < $propertyPath->getLength() &&`
`116`	`117`	`(`
`117`	`118`	`($objectOrArray instanceof \ArrayAccess && !isset($objectOrArray[$property])) \|\|`
`118`	`119`	`(is_array($objectOrArray) && !array_key_exists($property, $objectOrArray))`
`119`	`120`	`)`
`120`	`121`	`) {`
`121`		`- $objectOrArray[$property] = $i + 1 < $propertyPath->getLength() ? array() : null;`
	`122`	`+ $objectOrArray[$property] = array();`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`if ($isIndex) {`