From 256d441b21f77547cb15c0fc02ad350aa10bd14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 15 Jun 2015 10:18:21 +0200
Subject: [PATCH] [FrameworkBundle] Reuse PropertyAccessor service for
 ObjectNormalizer

---
 src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml  | 4 +++-
 .../Bundle/FrameworkBundle/Resources/config/serializer.xml    | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 509030910163..7d1a588fbad3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -55,8 +55,10 @@
         </service>
 
         <!-- CoreExtension -->
+        <service id="form.property_accessor" alias="property_accessor" public="false" />
+
         <service id="form.type.form" class="Symfony\Component\Form\Extension\Core\Type\FormType">
-            <argument type="service" id="property_accessor"/>
+            <argument type="service" id="form.property_accessor" />
             <tag name="form.type" alias="form" />
         </service>
         <service id="form.type.birthday" class="Symfony\Component\Form\Extension\Core\Type\BirthdayType">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index ecc8f4920cf7..e5b53e94938e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -17,9 +17,13 @@
             <argument type="collection" />
         </service>
 
+        <service id="serializer.property_accessor" alias="property_accessor" public="false" />
+
         <!-- Normalizer -->
         <service id="serializer.normalizer.object" class="Symfony\Component\Serializer\Normalizer\ObjectNormalizer" public="false">
             <argument type="service" id="serializer.mapping.class_metadata_factory" />
+            <argument>null</argument>
+            <argument type="service" id="serializer.property_accessor" />
 
             <!-- Run after all custom serializers -->
             <tag name="serializer.normalizer" priority="-1000" />