Merge branch '3.4' into 4.0

* 3.4:
  Added the versionadded directive
  [Encore] Fix vue-loader installation
  Add section about anonymous services in YAML
  update the serializer cache description

Author: javiereguiluz

frontend/encore/vuejs.rst

@@ -5,7 +5,7 @@ Want to use `Vue.js`_? No problem! First, install Vue and some dependencies:
 
 .. code-block:: terminal
 
-    $ yarn add --dev vue vue-loader vue-template-compiler
+    $ yarn add --dev vue vue-loader@^14 vue-template-compiler
 
 Then, activate the ``vue-loader`` in ``webpack.config.js``:
 

reference/configuration/framework.rst

@@ -1783,6 +1783,8 @@ ships with multiple adapters: ``cache.adapter.apcu``, ``cache.adapter.doctrine``
     given the adapter they are based on. Internally, a pool wraps the definition
     of an adapter.
 
+.. _reference-cache-systen:
+
 system
 ......
 

serializer.rst

@@ -147,8 +147,10 @@ stored in one of the following locations:
 Configuring the Metadata Cache
 ------------------------------
 
-The metadata for the serializer is automatically cached. To configure the cache,
-configure the ``framework.cache.pools`` key in ``config/packages/framework.yaml``.
+The metadata for the serializer is automatically cached to enhance application
+performance. By default, the serializer uses the ``cache.system`` cache pool
+which is configured using the :ref:`cache.system <reference-cache-systen>`
+option.
 
 Enabling a Name Converter
 -------------------------

service_container/alias_private.rst

@@ -151,7 +151,10 @@ Anonymous Services
 
 .. note::
 
-    Anonymous services are only supported by the XML configuration format.
+    Anonymous services are only supported by the XML and YAML configuration formats.
+
+.. versionadded:: 3.3
+    The feature to configure anonymous services in YAML was introduced in Symfony 3.3.
 
 In some cases, you may want to prevent a service being used as a dependency of
 other services. This can be achieved by creating an anonymous service. These
@@ -160,23 +163,63 @@ created where they are used.
 
 The following example shows how to inject an anonymous service into another service:
 
-.. code-block:: xml
-
-    <!-- app/config/services.xml -->
-    <?xml version="1.0" encoding="UTF-8" ?>
-    <container xmlns="http://symfony.com/schema/dic/services"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/dic/services
-            http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-        <services>
-            <service id="foo" class="App\Foo">
-                <argument type="service">
-                    <service class="App\AnonymousBar" />
-                </argument>
-            </service>
-        </services>
-    </container>
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/services.yaml
+        services:
+            App\Foo:
+                arguments:
+                    - !service
+                        class: App\AnonymousBar
+
+    .. code-block:: xml
+
+        <!-- app/config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <services>
+                <service id="foo" class="App\Foo">
+                    <argument type="service">
+                        <service class="App\AnonymousBar" />
+                    </argument>
+                </service>
+            </services>
+        </container>
+
+Using an anonymous service as a factory looks like this:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/services.yaml
+        services:
+            App\Foo:
+                factory: [ !service { class: App\FooFactory }, 'constructFoo' ]
+
+    .. code-block:: xml
+
+        <!-- app/config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <services>
+                <service id="foo" class="App\Foo">
+                    <factory method="constructFoo">
+                        <service class="App\FooFactory"/>
+                    </factory>
+                </service>
+            </services>
+        </container>
 
 Deprecating Services
 --------------------