Merge branch '3.4' into 4.0

* 3.4:
  Fixed the priority of the sticky locale example
  Fixed a minor syntax issue in a VarDumper article
  Fixed the types of some options in Collection constraint
  Update finder.rst
  Handler formatter example was using wrong defined service
  Updated the behavior of the checkDNS option
  Update doctrine.rst
  Add example for Finder::exclude
  Update form_csrf_caching.rst
  do never fetch private services from the container
  Fixed minor issues
  Add lock configuration in framework bundle

Author: javiereguiluz

components/finder.rst

@@ -105,6 +105,7 @@ Each pattern has to resolve to at least one directory path.
 Exclude directories from matching with the
 :method:`Symfony\\Component\\Finder\\Finder::exclude` method::
 
+    // directories passed as argument must be relative to the ones defined with the in() method
     $finder->in(__DIR__)->exclude('ruby');
 
 It's also possible to ignore directories that you don't have permission to read::

components/var_dumper/advanced.rst

@@ -360,23 +360,23 @@ thus to dumpers. To help you do this (see the source code for how it works),
 the component comes with a set of wrappers for common additional semantics. You
 can use:
 
- * :class:`Symfony\\Component\\VarDumper\\Caster\\ConstStub` to wrap a value that is
-   best represented by a PHP constant;
- * :class:`Symfony\\Component\\VarDumper\\Caster\\ClassStub` to wrap a PHP identifier
-   (*i.e.* a class name, a method name, an interface, *etc.*);
- * :class:`Symfony\\Component\\VarDumper\\Caster\\CutStub` to replace big noisy
-   objects/strings/*etc.* by ellipses;
- * :class:`Symfony\\Component\\VarDumper\\Caster\\CutArrayStub` to keep only some
-   useful keys of an array;
- * :class:`Symfony\\Component\\VarDumper\\Caster\\EnumStub` to wrap a set of virtual
-   values (*i.e.* values that do not exist as properties in the original PHP data
-   structure, but are worth listing alongside with real ones);
- * :class:`Symfony\\Component\\VarDumper\\Caster\\LinkStub` to wrap strings that can
-   be turned into links by dumpers;
- * :class:`Symfony\\Component\\VarDumper\\Caster\\TraceStub` and their
- * :class:`Symfony\\Component\\VarDumper\\Caster\\FrameStub` and
- * :class:`Symfony\\Component\\VarDumper\\Caster\\ArgsStub` relatives to wrap PHP
-   traces (used by :class:`Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster`).
+* :class:`Symfony\\Component\\VarDumper\\Caster\\ConstStub` to wrap a value that is
+  best represented by a PHP constant;
+* :class:`Symfony\\Component\\VarDumper\\Caster\\ClassStub` to wrap a PHP identifier
+  (*i.e.* a class name, a method name, an interface, *etc.*);
+* :class:`Symfony\\Component\\VarDumper\\Caster\\CutStub` to replace big noisy
+  objects/strings/*etc.* by ellipses;
+* :class:`Symfony\\Component\\VarDumper\\Caster\\CutArrayStub` to keep only some
+  useful keys of an array;
+* :class:`Symfony\\Component\\VarDumper\\Caster\\EnumStub` to wrap a set of virtual
+  values (*i.e.* values that do not exist as properties in the original PHP data
+  structure, but are worth listing alongside with real ones);
+* :class:`Symfony\\Component\\VarDumper\\Caster\\LinkStub` to wrap strings that can
+  be turned into links by dumpers;
+* :class:`Symfony\\Component\\VarDumper\\Caster\\TraceStub` and their
+* :class:`Symfony\\Component\\VarDumper\\Caster\\FrameStub` and
+* :class:`Symfony\\Component\\VarDumper\\Caster\\ArgsStub` relatives to wrap PHP
+  traces (used by :class:`Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster`).
 
 For example, if you know that your ``Product`` objects have a ``brochure`` property
 that holds a file name or a URL, you can wrap them in a ``LinkStub`` to tell

http_cache/form_csrf_caching.rst

@@ -36,7 +36,8 @@ Another option would be to load the form via an uncached AJAX request, but
 cache the rest of the HTML response.
 
 Or you can even load just the CSRF token with an AJAX request and replace the
-form field value with it.
+form field value with it. Take a look at :doc:`hinclude.js </templating/hinclude>`
+for a nice solution.
 
 .. _`Cross-site request forgery`: http://en.wikipedia.org/wiki/Cross-site_request_forgery
 .. _`Security CSRF Component`: https://github.com/symfony/security-csrf

logging/processors.rst

@@ -138,7 +138,7 @@ Finally, set the formatter to be used on whatever handler you want:
                     type="stream"
                     path="%kernel.logs_dir%/%kernel.environment%.log"
                     level="debug"
-                    formatter="app.logger.session_request_processor"
+                    formatter="monolog.formatter.session_request"
                 />
             </monolog:config>
         </container>
@@ -152,7 +152,7 @@ Finally, set the formatter to be used on whatever handler you want:
                     'type'      => 'stream',
                     'path'      => '%kernel.logs_dir%/%kernel.environment%.log',
                     'level'     => 'debug',
-                    'formatter' => 'app.logger.session_request_processor',
+                    'formatter' => 'monolog.formatter.session_request',
                 ),
             ),
         ));

reference/configuration/doctrine.rst

@@ -31,7 +31,12 @@ Full Default Configuration
                         port:                 ~
                         user:                 root
                         password:             ~
+                        # charset of the database
                         charset:              ~
+                        # charset and collation of the tables. Not inherited from database
+                        default_table_options:
+                            charset:          ~
+                            collate:          ~
                         path:                 ~
                         memory:               ~
 

reference/configuration/framework.rst

@@ -131,6 +131,7 @@ Configuration
             * `provider`_
             * `clearer`_
     * `prefix_seed`_
+* :ref:`lock <reference-lock>`
 
 secret
 ~~~~~~
@@ -1876,6 +1877,16 @@ It's also useful when using `blue/green deployment`_ strategies and more
 generally, when you need to abstract out the actual deployment directory (for
 example, when warming caches offline).
 
+.. _reference-lock:
+
+lock
+~~~~
+
+**type**: ``string``
+
+The default lock adapter. If not defined, the value is set to ``semaphore`` when
+available, or to ``flock`` otherwise. Store's DSN are also allowed.
+
 Full Default Configuration
 --------------------------
 
@@ -2032,6 +2043,14 @@ Full Default Configuration
                         provider: ~
                         clearer: ~
 
+            # lock configuration
+            lock:
+                invoice: 'redis://localhost'
+                report: semaphore
+            # lock: ~
+            # lock: 'flock'
+            # lock: ['semaphore', 'redis://localhost']
+
 .. _`HTTP Host header attacks`: http://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
 .. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
 .. _`Doctrine Cache`: http://docs.doctrine-project.org/projects/doctrine-common/en/latest/reference/caching.html

reference/constraints/Collection.rst

@@ -310,7 +310,7 @@ error will be returned. If set to ``true``, extra fields are ok.
 extraFieldsMessage
 ~~~~~~~~~~~~~~~~~~
 
-**type**: ``boolean`` **default**: ``This field was not expected.``
+**type**: ``string`` **default**: ``This field was not expected.``
 
 The message shown if `allowExtraFields`_ is false and an extra field is
 detected.
@@ -328,7 +328,7 @@ option are not present in the underlying collection.
 missingFieldsMessage
 ~~~~~~~~~~~~~~~~~~~~
 
-**type**: ``boolean`` **default**: ``This field is missing.``
+**type**: ``string`` **default**: ``This field is missing.``
 
 The message shown if `allowMissingFields`_ is false and one or more fields
 are missing from the underlying collection.

reference/constraints/Url.rst

@@ -233,7 +233,8 @@ checkDNS
 
 By default, this constraint just validates the syntax of the given URL. If you
 also need to check whether the associated host exists, set the ``checkDNS``
-option to ``true``:
+option to the value of any of the ``CHECK_DNS_TYPE_*`` constants in the
+:class:`Symfony\\Component\\Validator\\Constraints\\Url` class:
 
 .. configuration-block::
 
@@ -248,7 +249,7 @@ option to ``true``:
         {
             /**
              * @Assert\Url(
-             *    checkDNS = true
+             *    checkDNS = "ANY"
              * )
              */
              protected $bioUrl;
@@ -260,7 +261,7 @@ option to ``true``:
         App\Entity\Author:
             properties:
                 bioUrl:
-                    - Url: { checkDNS: true }
+                    - Url: { checkDNS: 'ANY' }
 
     .. code-block:: xml
 
@@ -273,7 +274,7 @@ option to ``true``:
             <class name="App\Entity\Author">
                 <property name="bioUrl">
                     <constraint name="Url">
-                        <option name="checkDNS">true</option>
+                        <option name="checkDNS">ANY</option>
                     </constraint>
                 </property>
             </class>
@@ -292,13 +293,13 @@ option to ``true``:
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('bioUrl', new Assert\Url(array(
-                    'checkDNS'  => true,
+                    'checkDNS'  => Assert\Url::CHECK_DNS_TYPE_ANY,
                 )));
             }
         }
 
 This option uses the :phpfunction:`checkdnsrr` PHP function to check the validity
-of the ``ANY`` DNS record corresponding to the host associated with the given URL.
+of the DNS record corresponding to the host associated with the given URL.
 
 dnsMessage
 ~~~~~~~~~~

service_container/alias_private.rst

@@ -68,17 +68,15 @@ gives you better errors: if you try to reference a non-existent service, you wil
 get a clear error when you refresh *any* page, even if the problematic code would
 not have run on that page.
 
-Now that the service is private, you *should not* fetch the service directly
+Now that the service is private, you *must not* fetch the service directly
 from the container::
 
     use App\Service\Foo;
 
     $container->get(Foo::class);
 
-This *may or may not work*, depending on how the container has optimized the
-service instantiation and, even in the cases where it works, this possibility is
-deprecated. Simply said: A service should be marked as private if you do not want
-to access it directly from your code.
+Simply said: A service can be marked as private if you do not want to access
+it directly from your code.
 
 However, if a service has been marked as private, you can still alias it
 (see below) to access this service (via the alias).

session/locale_sticky_session.rst

@@ -52,8 +52,8 @@ correct locale however you want::
         public static function getSubscribedEvents()
         {
             return array(
-                // must be registered after the default Locale listener
-                KernelEvents::REQUEST => array(array('onKernelRequest', 15)),
+                // must be registered before (i.e. with a higher priority than) the default Locale listener
+                KernelEvents::REQUEST => array(array('onKernelRequest', 20)),
             );
         }
     }