bug #18603 [PropertyAccess] ->getValue() should be read-only (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c1cb357d3aac · 2016-04-20T20:37:31.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [PropertyAccess] ->getValue() should be read-only | Q | A | ------------- | --- | Branch? | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #18601 | License | MIT | Doc PR | - Commits ------- fa68529 [PropertyAccess] ->getValue() should be read-only
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -275,10 +275,11 @@ private function readPropertiesUntil($zval, PropertyPathInterface $propertyPath,
                     (is_array($zval[self::VALUE]) && !isset($zval[self::VALUE][$property]) && !array_key_exists($property, $zval[self::VALUE]))
                 ) {
                     if ($i + 1 < $propertyPath->getLength()) {
-                        $zval[self::VALUE][$property] = array();
-
                         if (isset($zval[self::REF])) {
+                            $zval[self::VALUE][$property] = array();
                             $zval[self::REF] = $zval[self::VALUE];
+                        } else {
+                            $zval[self::VALUE] = array($property => array());
                         }
                     }
                 }
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -92,9 +92,11 @@ public function testGetValueReadsArrayWithCustomPropertyPath()
 
     public function testGetValueReadsArrayWithMissingIndexForCustomPropertyPath()
     {
-        $array = array('child' => array('index' => array()));
+        $object = new \ArrayObject();
+        $array = array('child' => array('index' => $object));
 
-        $this->assertNull($this->propertyAccessor->getValue($array, '[child][index][firstName]'));
+        $this->assertNull($this->propertyAccessor->getValue($array, '[child][index][foo][bar]'));
+        $this->assertSame(array(), $object->getArrayCopy());
     }
 
     public function testGetValueReadsProperty()

Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,11 @@ private function readPropertiesUntil($zval, PropertyPathInterface $propertyPath,`
`275`	`275`	`(is_array($zval[self::VALUE]) && !isset($zval[self::VALUE][$property]) && !array_key_exists($property, $zval[self::VALUE]))`
`276`	`276`	`) {`
`277`	`277`	`if ($i + 1 < $propertyPath->getLength()) {`
`278`		`- $zval[self::VALUE][$property] = array();`
`279`		`-`
`280`	`278`	`if (isset($zval[self::REF])) {`
	`279`	`+ $zval[self::VALUE][$property] = array();`
`281`	`280`	`$zval[self::REF] = $zval[self::VALUE];`
	`281`	`+ } else {`
	`282`	`+ $zval[self::VALUE] = array($property => array());`
`282`	`283`	`}`
`283`	`284`	`}`
`284`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,11 @@ public function testGetValueReadsArrayWithCustomPropertyPath()`
`92`	`92`
`93`	`93`	`public function testGetValueReadsArrayWithMissingIndexForCustomPropertyPath()`
`94`	`94`	`{`
`95`		`- $array = array('child' => array('index' => array()));`
	`95`	`+ $object = new \ArrayObject();`
	`96`	`+ $array = array('child' => array('index' => $object));`
`96`	`97`
`97`		`- $this->assertNull($this->propertyAccessor->getValue($array, '[child][index][firstName]'));`
	`98`	`+ $this->assertNull($this->propertyAccessor->getValue($array, '[child][index][foo][bar]'));`
	`99`	`+ $this->assertSame(array(), $object->getArrayCopy());`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`public function testGetValueReadsProperty()`