From d0c0294a7b4dc9ab8c7225048a2ce42742de625d Mon Sep 17 00:00:00 2001
From: Alessandro Chitolina <alekitto@gmail.com>
Date: Tue, 22 Dec 2015 18:06:45 +0100
Subject: [PATCH] [PropertyAccess] Reorder elements array after
 PropertyPathBuilder::replace

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17102
| License       | MIT
| Doc PR        |
---
 .../Component/PropertyAccess/PropertyPathBuilder.php  |  1 +
 .../PropertyAccess/Tests/PropertyPathBuilderTest.php  | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
index 5d7fdac6fd..39bf2da2e4 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyPathBuilder.php
@@ -142,6 +142,7 @@ class PropertyPathBuilder
             $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
index 3767e08c82..6b4fdd8db9 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
@@ -252,6 +252,17 @@ class PropertyPathBuilderTest extends \PHPUnit_Framework_TestCase
         $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);