Merge branch '2.3' into 2.7

fabpot · fabpot · commit 2c4620400168 · 2015-10-05T09:28:51.000+02:00
* 2.3:
  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
@@ -239,7 +239,9 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr
                     ));
                 }
 
-                $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
@@ -130,6 +130,15 @@ public function testGetValueReadsMagicGetThatReturnsConstant()
         $this->assertSame('constant value', $this->propertyAccessor->getValue(new TestClassMagicGet('Bernhard'), 'constantMagicProperty'));
     }
 
+    public function testGetValueNotModifyObject()
+    {
+        $object = new \stdClass();
+        $object->firstName = array('Bernhard');
+
+        $this->assertNull($this->propertyAccessor->getValue($object, 'firstName[1]'));
+        $this->assertSame(array('Bernhard'), $object->firstName);
+    }
+
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
      */

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,9 @@ private function &readPropertiesUntil(&$objectOrArray, PropertyPathInterface $pr`
`239`	`239`	`));`
`240`	`240`	`}`
`241`	`241`
`242`		`- $objectOrArray[$property] = $i + 1 < $propertyPath->getLength() ? array() : null;`
	`242`	`+ if ($i + 1 < $propertyPath->getLength()) {`
	`243`	`+ $objectOrArray[$property] = array();`
	`244`	`+ }`
`243`	`245`	`}`
`244`	`246`
`245`	`247`	`if ($isIndex) {`