[PropertyAccess] Reorder elements array after PropertyPathBuilder::replace

alekitto · alekitto · commit d0c0294a7b4d · 2015-12-22T18:06:45.000+01:00
| Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#17102 | License | MIT | Doc PR |
diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -142,6 +142,7 @@ public function replace($offset, $length, $path, $pathOffset = 0, $pathLength =
             $this->elements[$offset + $i] = $path->getElement($pathOffset + $i);
             $this->isIndex[$offset + $i] = $path->isIndex($pathOffset + $i);
         }
+        ksort($this->elements);
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
@@ -252,6 +252,17 @@ public function testReplaceWithLongerPath()
         $this->assertEquals($path, $builder->getPropertyPath());
     }
 
+    public function testReplaceWithLongerPathKeepsOrder()
+    {
+        $path = new PropertyPath('new1.new2.new3');
+        $expected = new PropertyPath('new1.new2.new3.old2');
+
+        $builder = new PropertyPathBuilder(new PropertyPath('old1.old2'));
+        $builder->replace(0, 1, $path);
+
+        $this->assertEquals($expected, $builder->getPropertyPath());
+    }
+
     public function testRemove()
     {
         $this->builder->remove(3);

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ public function replace($offset, $length, $path, $pathOffset = 0, $pathLength =`
`142`	`142`	`$this->elements[$offset + $i] = $path->getElement($pathOffset + $i);`
`143`	`143`	`$this->isIndex[$offset + $i] = $path->isIndex($pathOffset + $i);`
`144`	`144`	`}`
	`145`	`+ ksort($this->elements);`
`145`	`146`	`}`
`146`	`147`
`147`	`148`	`/**`