From 88ef89c8dc81fb9d31cabb0392fb119d6a24f73e Mon Sep 17 00:00:00 2001
From: Titouan Galopin <galopintitouan@gmail.com>
Date: Sat, 16 Apr 2016 15:52:14 +0200
Subject: [PATCH] [FrameworkBundle][Serializer] Fix APC cache service name and
 deprecate old name

---
 UPGRADE-3.1.md                                              | 5 +++++
 UPGRADE-4.0.md                                              | 3 +++
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md             | 3 ++-
 .../Bundle/FrameworkBundle/Resources/config/serializer.xml  | 6 +++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-3.1.md b/UPGRADE-3.1.md
index 969c5ef7991f..eddac865e8fb 100644
--- a/UPGRADE-3.1.md
+++ b/UPGRADE-3.1.md
@@ -83,6 +83,11 @@ FrameworkBundle
     - `"form.type.submit"`
     - `"form.type.reset"`
 
+ * The service `serializer.mapping.cache.apc`  has been deprecated in favor of
+   `serializer.mapping.cache.doctrine.apc` to be consistent with the validator
+   cache service. If you are using `serializer.mapping.cache.apc`, use
+   `serializer.mapping.cache.doctrine.apc` instead.
+
 HttpKernel
 ----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 2e5f22379a4b..2f965b0cc24a 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -75,6 +75,9 @@ FrameworkBundle
     - `"form.type.submit"`
     - `"form.type.reset"`
 
+ * The service `serializer.mapping.cache.apc` has been removed; use
+   `serializer.mapping.cache.doctrine.apc` instead.
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index afdcac2da5a7..28e45f9c27d2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -7,7 +7,8 @@ CHANGELOG
  * Added `Controller::json` to simplify creating JSON responses when using the Serializer component
  * Deprecated absolute template paths support in the template name parser
  * Deprecated using core form types without dependencies as services
- * added `Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector`
+ * Added `Symfony\Bundle\FrameworkBundle\DataCollector\RequestDataCollector`
+ * Deprecated service `serializer.mapping.cache.apc` (use `serializer.mapping.cache.doctrine.apc` instead)
 
 3.0.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
index 752588c37e7e..d5b5093fb648 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -38,12 +38,16 @@
         </service>
 
         <!-- Cache -->
-        <service id="serializer.mapping.cache.apc" class="Doctrine\Common\Cache\ApcCache" public="false">
+        <service id="serializer.mapping.cache.doctrine.apc" class="Doctrine\Common\Cache\ApcCache" public="false">
             <call method="setNamespace">
                 <argument>%serializer.mapping.cache.prefix%</argument>
             </call>
         </service>
 
+        <service id="serializer.mapping.cache.apc" parent="serializer.mapping.cache.doctrine.apc">
+            <deprecated>The "%service_id%" service is deprecated since Symfony 3.1 and will be removed in 4.0. Use "serializer.mapping.cache.doctrine.apc" instead</deprecated>
+        </service>
+
         <!-- Encoders -->
         <service id="serializer.encoder.xml" class="Symfony\Component\Serializer\Encoder\XmlEncoder" public="false">
             <tag name="serializer.encoder" />