[FrameworkBundle][Serializer] Fix APC cache service name and deprecate old name

tgalopin · tgalopin · commit 88ef89c8dc81 · 2016-04-19T08:52:34.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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" />
