Merge branch '3.2'

* 3.2:
  [File Uploads] Check if the entity contains the files
  [HttpFoundation][Fix] Component version
  Explain how to get all flash messages
  Documented the security options related to redirections
  Reworded a note about custom constraints
  Minor fix in  event (file uploading)
  Update configuration.rst
  Fix faulty conflict resolution
  Fixed a syntax issue
  Minor change
  Fix .rst formatting
  Twig Extension does no longer need getName() method
  Fixed the RST syntax
  Minor rewords
  [DependencyInjection][Improve] Constant YAML with expression language]
  [Yaml] fix dump arguments
  Standalone TwigRendererEngine argument
  Document that you can't pass empty strings to console options

Author: xabbuh

bundles/configuration.rst

@@ -325,7 +325,7 @@ configuration of a specific bundle. The namespace is returned from the
 :method:`Extension::getNamespace() <Symfony\\Component\\DependencyInjection\\Extension\\Extension::getNamespace>`
 method. By convention, the namespace is a URL (it doesn't have to be a valid
 URL nor does it need to exists). By default, the namespace for a bundle is
-``http://example.org/dic/schema/DI_ALIAS``, where ``DI_ALIAS`` is the DI alias of
+``http://example.org/schema/dic/DI_ALIAS``, where ``DI_ALIAS`` is the DI alias of
 the extension. You might want to change this to a more professional URL::
 
     // src/Acme/HelloBundle/DependencyInjection/AcmeHelloExtension.php

components/form.rst

@@ -193,7 +193,7 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
         $viewsDir,
         $vendorTwigBridgeDir.'/Resources/views/Form',
     )));
-    $formEngine = new TwigRendererEngine(array($defaultFormTheme));
+    $formEngine = new TwigRendererEngine(array($defaultFormTheme), $twig);
     $twig->addRuntimeLoader(new \Twig_FactoryRuntimeLoader(array(
         TwigRenderer::class => function () use ($formEngine, $csrfManager) {
             return new TwigRenderer($formEngine, $csrfManager);

components/yaml.rst

@@ -276,7 +276,7 @@ flag::
 Similarly you can use ``DUMP_EXCEPTION_ON_INVALID_TYPE`` when dumping::
 
     $data = new \stdClass(); // by default objects are invalid.
-    Yaml::dump($data, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE); // throws an exception
+    Yaml::dump($data, 2, 4, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE); // throws an exception
 
     echo $yaml; // { foo: bar }
 

console/input.rst

@@ -206,3 +206,7 @@ You can combine ``VALUE_IS_ARRAY`` with ``VALUE_REQUIRED`` or
     when the option was used without a value (``command --language``) or when
     it wasn't used at all (``command``). In both cases, the value retrieved for
     the option will be ``null``.
+
+    Similarly, due to a PHP limitation, there is no way to pass an empty string
+    as the value of an option. In ``command --prefix`` and ``command --prefix=''``
+    cases, the value of the ``prefix`` option will be ``null``.

contributing/code/core_team.rst

@@ -66,7 +66,7 @@ Active Core Members
   * **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
     bundles;
 
-  * **Kévin Dunglas** (`dunglas`_) can merge into the Serializer_
+  * **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
     component;
 
   * **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_

controller.rst

@@ -418,21 +418,43 @@ read any flash messages from the session:
     .. code-block:: html+twig
 
         {# app/Resources/views/base.html.twig #}
-        {% for flash_message in app.session.flashBag.get('notice') %}
+
+        {# you can read and display just one flash message type... #}
+        {% for flash_message in app.session.flash('notice') %}
             <div class="flash-notice">
                 {{ flash_message }}
             </div>
         {% endfor %}
 
+        {# ...or you can read and display every flash message available #}
+        {% for type, flash_messages in app.session.flashes %}
+            {% for flash_message in flash_messages %}
+                <div class="flash-{{ type }}">
+                    {{ flash_message }}
+                </div>
+            {% endif %}
+        {% endfor %}
+
     .. code-block:: html+php
 
         <!-- app/Resources/views/base.html.php -->
+
+        // you can read and display just one flash message type...
         <?php foreach ($view['session']->getFlash('notice') as $message): ?>
             <div class="flash-notice">
-                <?php echo "<div class='flash-error'>$message</div>" ?>
+                <?php echo $message ?>
             </div>
         <?php endforeach ?>
 
+        // ...or you can read and display every flash message available
+        <?php foreach ($view['session']->getFlashes() as $type => $flash_messages): ?>
+            <?php foreach ($flash_messages as $flash_message): ?>
+                <div class="flash-<?php echo $type ?>">
+                    <?php echo $message ?>
+                </div>
+            <?php endforeach ?>
+        <?php endforeach ?>
+
 .. note::
 
     It's common to use ``notice``, ``warning`` and ``error`` as the keys of the

controller/upload_file.rst

@@ -243,6 +243,11 @@ logic to a separate service::
 
             return $fileName;
         }
+
+        public function getTargetDir()
+        {
+            return $this->targetDir;
+        }
     }
 
 Then, define a service for this class:
@@ -443,9 +448,13 @@ controller.
             {
                 $entity = $args->getEntity();
 
-                $fileName = $entity->getBrochure();
+                if (!$entity instanceof Product) {
+                    return;
+                }
 
-                $entity->setBrochure(new File($this->targetPath.'/'.$fileName));
+                if ($fileName = $entity->getBrochure()) {
+                    $entity->setBrochure(new File($this->uploader->getTargetDir().'/'.$fileName));
+                }
             }
         }
 

create_framework/http_foundation.rst

@@ -119,18 +119,7 @@ To use this component, add it as a dependency of the project:
 Running this command will also automatically download the Symfony
 HttpFoundation component and install it under the ``vendor/`` directory.
 A ``composer.json`` and a ``composer.lock`` file will be generated as well,
-containing the new requirement:
-
-.. code-block:: json
-
-    {
-        "require": {
-            "symfony/http-foundation": "^3.0"
-        }
-    }
-
-The code block shows the content of the ``composer.json`` file (the actual
-version may vary).
+containing the new requirement.
 
 .. sidebar:: Class Autoloading
 

reference/configuration/security.rst

@@ -386,10 +386,37 @@ request to the ``check_path`` URL.
 Redirecting after Login
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-* ``always_use_default_target_path`` (type: ``boolean``, default: ``false``)
-* ``default_target_path`` (type: ``string``, default: ``/``)
-* ``target_path_parameter`` (type: ``string``, default: ``_target_path``)
-* ``use_referer`` (type: ``boolean``, default: ``false``)
+always_use_default_target_path
+..............................
+
+**type**: ``boolean`` **default**: ``false``
+
+If ``true``, users are always redirected to the default target path regardless
+of the previous URL that was stored in the session.
+
+default_target_path
+....................
+
+**type**: ``string`` **default**: ``/``
+
+The page users are redirected to when there is no previous page stored in the
+session (for example, when the users browse the login page directly).
+
+target_path_parameter
+.....................
+
+**type**: ``string`` **default**: ``_target_path``
+
+When using a login form, if you include an HTML element to set the target path,
+this option lets you change the name of the HTML element itself.
+
+use_referer
+...........
+
+**type**: ``boolean`` **default**: ``false``
+
+If ``true``, the user is redirected to the value stored in the ``HTTP_REFERER``
+header when no previous URL was stored in the session.
 
 .. _reference-security-pbkdf2:
 

service_container/parameters.rst

@@ -230,7 +230,7 @@ key and define the type as ``constant``.
         parameters:
             global.constant.value: !php/const:GLOBAL_CONSTANT
             my_class.constant.value: !php/const:My_Class::CONSTANT_NAME
-        
+
     .. code-block:: xml
 
         <?xml version="1.0" encoding="UTF-8" ?>
@@ -249,7 +249,6 @@ key and define the type as ``constant``.
         $container->setParameter('global.constant.value', GLOBAL_CONSTANT);
         $container->setParameter('my_class.constant.value', My_Class::CONSTANT_NAME);
 
-
 PHP Keywords in XML
 -------------------
 

templating/twig_extension.rst

@@ -49,13 +49,16 @@ As an example you'll create a price filter to format a given number into price::
 
             return $price;
         }
-
-        public function getName()
-        {
-            return 'app_extension';
-        }
     }
 
+.. note::
+ 
+    Prior to Twig 1.26, your extension had to define an additional ``getName()``
+    method that returned a string with the extension's internal name (e.g.
+    ``app.my_extension``). When your extension needs to be compatible with Twig
+    versions before 1.26, include this method which is omitted in the example 
+    above.
+    
 .. tip::
 
     Along with custom filters, you can also add custom `functions`_ and register

validation/custom_constraint.rst

@@ -193,9 +193,9 @@ load this service from the container.
 
 .. note::
 
-    In earlier versions of Symfony, the tag required an ``alias`` key (usually set
-    to the class name). This is still allowed your constraint's ``validateBy()``
-    method can return this alias (instead of a class name).
+    In earlier versions of Symfony, the tag required an ``alias`` key (usually
+    set to the class name). This ``alias`` is now optional, but if you define
+    it, your constraint's ``validatedBy()`` method must return the same value.
 
 Class Constraint Validator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~