Merge branch '4.0' into 4.1

* 4.0:
  the product category must be nullable
  Added the versionadded directive
  remove reference to Assetic
  [Encore] Fix vue-loader installation
  Add section about anonymous services in YAML
  update the serializer cache description
  render versionadded directive outside the code block
  remove remaining AppBundle references

Author: javiereguiluz

doctrine/associations.rst

@@ -146,7 +146,6 @@ the ``Product`` entity (and getter & setter methods):
 
             /**
              * @ORM\ManyToOne(targetEntity="App\Entity\Category", inversedBy="products")
-             * @ORM\JoinColumn(nullable=false)
              */
             private $category;
 
@@ -155,7 +154,7 @@ the ``Product`` entity (and getter & setter methods):
                 return $this->category;
             }
 
-            public function setCategory(Category $category): self
+            public function setCategory(?Category $category): self
             {
                 $this->category = $category;
 

frontend.rst

@@ -77,13 +77,6 @@ Full API
 
 * `Full API`_: https://github.com/symfony/webpack-encore/blob/master/index.js
 
-Assetic
--------
-
-Assetic is a pure PHP library that helps to process & optimize your assets (similar
-to Encore). Even though we recommend using Encore, Assetic still works great. For
-a comparison, see :doc:`/frontend/encore/versus-assetic`.
-
 For more about Assetic, see :doc:`/frontend/assetic`.
 
 Other Front-End Articles
@@ -93,6 +86,7 @@ Other Front-End Articles
     :hidden:
     :glob:
 
+    frontend/assetic
     frontend/encore/installation
     frontend/encore/simple-example
     frontend/encore/*

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

@@ -1822,6 +1822,8 @@ the ``dev`` environment).
     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
 --------------------

service_container/service_decoration.rst

@@ -31,7 +31,7 @@ the original service is lost:
             <services>
                 <service id="App\Mailer" />
 
-                <!-- this replaces the old AppBundle\Mailer definition with the new
+                <!-- this replaces the old App\Mailer definition with the new
                      one, the old definition is lost -->
                 <service id="App\Mailer" class="App\DecoratingMailer" />
             </services>
@@ -45,7 +45,7 @@ the original service is lost:
 
         $container->register(Mailer::class);
 
-        // this replaces the old AppBundle\Mailer definition with the new one, the
+        // this replaces the old App\Mailer definition with the new one, the
         // old definition is lost
         $container->register(Mailer::class, DecoratingMailer::class);
 

service_container/service_subscribers_locators.rst

@@ -71,11 +71,11 @@ Use its ``getSubscribedServices()`` method to include as many services as needed
 in the service subscriber and change the type hint of the container to
 a PSR-11 ``ContainerInterface``::
 
-    // src/AppBundle/CommandBus.php
-    namespace AppBundle;
+    // src/CommandBus.php
+    namespace App;
 
-    use AppBundle\CommandHandler\BarHandler;
-    use AppBundle\CommandHandler\FooHandler;
+    use App\CommandHandler\BarHandler;
+    use App\CommandHandler\FooHandler;
     use Psr\Container\ContainerInterface;
     use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
 
@@ -91,8 +91,8 @@ a PSR-11 ``ContainerInterface``::
         public static function getSubscribedServices()
         {
             return [
-                'AppBundle\FooCommand' => FooHandler::class,
-                'AppBundle\BarCommand' => BarHandler::class,
+                'App\FooCommand' => FooHandler::class,
+                'App\BarCommand' => BarHandler::class,
             ];
         }
 
@@ -204,7 +204,7 @@ service type to a service.
 
         // app/config/services.yml
         services:
-            AppBundle\CommandBus:
+            App\CommandBus:
                 tags:
                     - { name: 'container.service_subscriber', key: 'logger', id: 'monolog.logger.event' }
 
@@ -218,7 +218,7 @@ service type to a service.
 
             <services>
 
-                <service id="AppBundle\CommandBus">
+                <service id="App\CommandBus">
                     <tag name="container.service_subscriber" key="logger" id="monolog.logger.event" />
                 </service>
 
@@ -228,7 +228,7 @@ service type to a service.
     .. code-block:: php
 
         // app/config/services.php
-        use AppBundle\CommandBus;
+        use App\CommandBus;
 
         // ...
 

templating/twig_extension.rst

@@ -137,12 +137,6 @@ previous ``priceFilter()`` method::
         }
     }
 
-Register the Lazy-Loaded Extension as a Service
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- .. versionadded:: 3.4
-     The ``RuntimeExtensionInterface`` was introduced in Symfony 3.4.
-
 If you're using the default ``services.yaml`` configuration, this will already
 work! Otherwise, :ref:`create a service <service-container-creating-service>`
 for this class and :doc:`tag your service </service_container/tags>` with ``twig.runtime``.