Merge branch '4.1'

* 4.1:
  Fixed some wrong file paths
  Change code file location
  Fix typo for variable name
  Add link to configuration documentation
  Update upgrade_major.rst
  Add composer require symfony/webpack-encore-pack
  Reword the intro of a console article
  fix(Caution): Validator folder for YAML or XML format
  Fix the interface/abstract classes documentation
  Fix typo in Memcached adapter documentation
  [#9507] add versionadded directive
  Revert "[#9507] remove csv processor, it was added in 4.1"
  [#9507] remove csv processor, it was added in 4.1

Author: javiereguiluz

components/cache/adapters/memcached_adapter.rst

@@ -263,7 +263,7 @@ Available Options
     small outgoing messages and sending them all at once.
 
 ``use_udp`` (type: ``bool``, default: ``false``)
-    Enables or disabled the use of `User Datagram Protocol (UDP)`_ mode (instead
+    Enables or disables the use of `User Datagram Protocol (UDP)`_ mode (instead
     of `Transmission Control Protocol (TCP)`_ mode), where all operations are
     executed in a "fire-and-forget" manner; no attempt to ensure the operation
     has been received or acted on will be made once the client has executed it.

components/console/console_arguments.rst

@@ -1,12 +1,14 @@
 .. index::
     single: Console; Console arguments
 
-Understanding how Console Arguments Are Handled
-===============================================
+Understanding how Console Arguments and Options Are Handled
+===========================================================
 
-It can be difficult to understand the way arguments are handled by the console application.
-The Symfony Console application, like many other CLI utility tools, follows the behavior
-described in the `docopt`_ standards.
+Symfony Console applications follow the same `docopt`_ standard used in most
+CLI utility tools. This article explains how to handle edge-cases when the
+commands define options with required values, without values, etc. Read
+:doc:`this other article </console/input>` to learn about using arguments and
+options inside Symfony Console commands.
 
 Have a look at the following command that has three options::
 

components/serializer.rst

@@ -1168,8 +1168,8 @@ serialize and deserialize these objects using a *"discriminator class mapping"*.
 
 The discriminator is the field (in the serialized string) used to differentiate
 between the possible objects. In practice, when using the Serializer component,
-pass the :class:`Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorResolver`
-to the :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer`.
+pass a :class:`Symfony\\Component\\Serializer\\Mapping\\ClassDiscriminatorResolverInterface`
+implementation to the :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer`.
 
 Consider an application that defines an abstract ``CodeRepository`` class
 extended by ``GitHubCodeRepository`` and ``BitBucketCodeRepository`` classes.
@@ -1178,18 +1178,20 @@ This example shows how to serialize and deserialize those objects::
     // ...
     use Symfony\Component\Serializer\Encoder\JsonEncoder;
     use Symfony\Component\Serializer\Mapping\ClassDiscriminatorMapping;
-    use Symfony\Component\Serializer\Mapping\ClassDiscriminatorResolver;
+    use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
     use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
     use Symfony\Component\Serializer\Serializer;
 
-    $discriminator = new ClassDiscriminatorResolver();
+    $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+
+    $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
     $discriminator->addClassMapping(CodeRepository::class, new ClassDiscriminatorMapping('type', [
         'github' => GitHubCodeRepository::class,
         'bitbucket' => BitBucketCodeRepository::class,
     ]));
 
     $serializer = new Serializer(
-        array(new ObjectNormalizer(null, null, null, null, $discriminator)),
+        array(new ObjectNormalizer($classMetadataFactory, null, null, null, $discriminator)),
         array('json' => new JsonEncoder())
     );
 

configuration/external_parameters.rst

@@ -257,6 +257,9 @@ Symfony provides the following env var processors:
         framework:
            trusted_hosts: '%env(csv:TRUSTED_HOSTS)%'
 
+    .. versionadded:: 4.1
+        The ``csv`` processor was introduced in Symfony 4.1.
+
 ``env(file:FOO)``
     Returns the contents of a file whose path is the value of the ``FOO`` env var:
 

console/input.rst

@@ -257,7 +257,7 @@ To solve this issue, you have to set the option's default value to ``false``::
 
 Now check the value of the option and keep in mind that ``false !== null``::
 
-    $optionValue = $input->getOptions('yell');
+    $optionValue = $input->getOption('yell');
     $yell = ($optionValue !== false);
     $yellLouder = ($optionValue === 'louder');
 

frontend/encore/installation.rst

@@ -23,7 +23,7 @@ Then, install Encore into your project with Yarn:
 
     .. code-block:: terminal
 
-        $ composer require encore
+        $ composer require symfony/webpack-encore-pack
         $ yarn install
 
     This will create a ``webpack.config.js`` file, add the ``assets/`` directory, and add ``node_modules/`` to

page_creation.rst

@@ -329,6 +329,7 @@ Ok, time to finish mastering the fundamentals by reading these articles:
 * :doc:`/routing`
 * :doc:`/controller`
 * :doc:`/templating`
+* :doc:`/configuration`
 
 Then, learn about other important topics like the
 :doc:`service container </service_container>`,

reference/forms/types/options/choice_label.rst.inc

@@ -17,7 +17,7 @@ more control::
             'maybe' => null,
         ),
         'choice_label' => function ($choiceValue, $key, $value) {
-            if ($value == choiceValue) {
+            if ($value == $choiceValue) {
                 return 'Definitely!';
             }
 

setup/upgrade_major.rst

@@ -1,7 +1,7 @@
 .. index::
     single: Upgrading; Major Version
 
-Upgrading a Major Version (e.g. 3.4.0 to 4.0.0)
+Upgrading a Major Version (e.g. 3.4.0 to 4.1.0)
 ===============================================
 
 Every two years, Symfony releases a new major version release (the first number
@@ -30,7 +30,7 @@ backwards incompatible changes. To accomplish this, the "old" (e.g. functions,
 classes, etc) code still works, but is marked as *deprecated*, indicating that
 it will be removed/changed in the future and that you should stop using it.
 
-When the major version is released (e.g. 4.0.0), all deprecated features and
+When the major version is released (e.g. 4.1.0), all deprecated features and
 functionality are removed. So, as long as you've updated your code to stop
 using these deprecated features in the last version before the major (e.g.
 3.4.*), you should be able to upgrade without a problem.
@@ -128,7 +128,7 @@ Composer by modifying your ``composer.json`` file:
         "...": "...",
 
         "require": {
-            "symfony/symfony": "^4.0",
+            "symfony/symfony": "^4.1",
         },
         "...": "..."
     }

validation.rst

@@ -43,8 +43,9 @@ So far, this is just an ordinary class that serves some purpose inside your
 application. The goal of validation is to tell you if the data
 of an object is valid. For this to work, you'll configure a list of rules
 (called :ref:`constraints <validation-constraints>`) that the object must
-follow in order to be valid. These rules can be specified via a number of
-different formats (YAML, XML, annotations, or PHP).
+follow in order to be valid. These rules are usually defined using PHP code or
+annotations but they can also be defined as a ``validation.yaml`` or
+``validation.xml`` file inside the ``config/validator/`` directory:
 
 For example, to guarantee that the ``$name`` property is not empty, add the
 following: