Merge branch '2.7' into 2.8

javiereguiluz · javiereguiluz · commit 811c4bef622f · 2018-01-29T17:48:22.000+01:00
* 2.7:
  Fixed the priority of the sticky locale example
  Fixed the types of some options in Collection constraint
  Update finder.rst
  Handler formatter example was using wrong defined service
  Update doctrine.rst
  Add example for Finder::exclude
  Update form_csrf_caching.rst
  do never fetch private services from the container
diff --git a/components/finder.rst b/components/finder.rst
@@ -103,6 +103,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');
 
 .. versionadded:: 2.3
diff --git a/http_cache/form_csrf_caching.rst b/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
diff --git a/logging/processors.rst b/logging/processors.rst
@@ -71,7 +71,7 @@ using a processor.
                     type: stream
                     path: '%kernel.logs_dir%/%kernel.environment%.log'
                     level: debug
-                    formatter: app.logger.session_request_processor
+                    formatter: monolog.formatter.session_request
 
     .. code-block:: xml
 
@@ -106,7 +106,7 @@ using a processor.
                     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>
@@ -132,7 +132,7 @@ using a processor.
                     'type'      => 'stream',
                     'path'      => '%kernel.logs_dir%/%kernel.environment%.log',
                     'level'     => 'debug',
-                    'formatter' => 'app.logger.session_request_processor',
+                    'formatter' => 'monolog.formatter.session_request',
                 ),
             ),
         ));
diff --git a/reference/configuration/doctrine.rst b/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:               ~
 
diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst
@@ -314,7 +314,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.
@@ -332,7 +332,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.
diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst
@@ -57,12 +57,11 @@ What makes private services special is that, if they are only injected once,
 they are converted from services to inlined instantiations (e.g. ``new PrivateThing()``).
 This increases the container's performance.
 
-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::
 
     $container->get('foo');
 
-This *may or may not work*, depending on if the service could be inlined.
 Simply said: A service can be marked as private if you do not want to access
 it directly from your code.
 
diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst
@@ -54,8 +54,8 @@ how you determine the desired locale from the request::
         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)),
             );
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ how you determine the desired locale from the request::`
`54`	`54`	`public static function getSubscribedEvents()`
`55`	`55`	`{`
`56`	`56`	`return array(`
`57`		`- // must be registered after the default Locale listener`
`58`		`- KernelEvents::REQUEST => array(array('onKernelRequest', 15)),`
	`57`	`+ // must be registered before (i.e. with a higher priority than) the default Locale listener`
	`58`	`+ KernelEvents::REQUEST => array(array('onKernelRequest', 20)),`
`59`	`59`	`);`
`60`	`60`	`}`
`61`	`61`	`}`