Merge branch '4.3' into 4.4

* 4.3:
  [#12637] update after merging up
  remove additional blank line
  fix typo (backport #12653)
  Change the default mapping type to XML
  Add isMasterRequest method
  Update MySQL column type definition
  improve sentence re: `content-disposition` header
  ContainerAwareEventDispatcher was removed
  Add some links to objects injected by Symfony in expressions

Author: xabbuh

components/event_dispatcher.rst

@@ -469,7 +469,6 @@ Other Dispatchers
 Besides the commonly used ``EventDispatcher``, the component comes
 with some other dispatchers:
 
-* :doc:`/components/event_dispatcher/container_aware_dispatcher`
 * :doc:`/components/event_dispatcher/immutable_dispatcher`
 * :doc:`/components/event_dispatcher/traceable_dispatcher`
 

components/expression_language/syntax.rst

@@ -308,3 +308,14 @@ Ternary Operators
 * ``foo ? 'yes' : 'no'``
 * ``foo ?: 'no'`` (equal to ``foo ? foo : 'no'``)
 * ``foo ? 'yes'`` (equal to ``foo ? 'yes' : ''``)
+
+Built-in Objects and Variables
+------------------------------
+
+When using this component inside a Symfony application, certain objects and
+variables are automatically injected by Symfony so you can use them in your
+expressions (e.g. the request, the current user, etc.):
+
+* :doc:`Variables available in security expressions </security/expressions>`;
+* :doc:`Variables available in service container expressions </service_container/expression_language>`;
+* :ref:`Variables available in routing expressions <routing-matching-expressions>`.

components/http_foundation.rst

@@ -534,7 +534,7 @@ Serving Files
 
 When sending a file, you must add a ``Content-Disposition`` header to your
 response. While creating this header for basic file downloads is straightforward,
-using non-ASCII filenames is more involving. The
+using non-ASCII filenames is more involved. The
 :method:`Symfony\\Component\\HttpFoundation\\HeaderUtils::makeDisposition`
 abstracts the hard work behind a simple API::
 

doctrine/pdo_session_storage.rst

@@ -218,7 +218,7 @@ MySQL
         `sess_id` VARCHAR(128) NOT NULL PRIMARY KEY,
         `sess_data` BLOB NOT NULL,
         `sess_time` INTEGER UNSIGNED NOT NULL,
-        `sess_lifetime` MEDIUMINT NOT NULL
+        `sess_lifetime` INTEGER UNSIGNED NOT NULL
     ) COLLATE utf8mb4_bin, ENGINE = InnoDB;
 
 .. note::

doctrine/reverse_engineering.rst

@@ -64,7 +64,7 @@ files: ``BlogPost.php`` and ``BlogComment.php``.
 
 .. tip::
 
-    It's also possible to generate the metadata files into XML or YAML:
+    It's also possible to generate the metadata files into XML or eventually into YAML:
 
     .. code-block:: terminal
 
@@ -82,7 +82,7 @@ files: ``BlogPost.php`` and ``BlogComment.php``.
                 mappings:
                     App:
                         is_bundle: false
-                        type: yml # Set to xml in case of XML mapping
+                        type: xml # "yml" is marked as deprecated for doctrine v2.6+ and will be removed in v3
                         dir: '%kernel.project_dir%/config/doctrine'
                         prefix: 'App\Entity'
                         alias: App

reference/events.rst

@@ -23,6 +23,9 @@ following information:
 :method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::getRequest`
     Returns the current ``Request`` being handled.
 
+:method:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent::isMasterRequest`
+    Checks if this is a master request.
+
 .. _kernel-core-request:
 
 ``kernel.request``

routing.rst

@@ -229,6 +229,8 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
     If you create your forms with :doc:`Symfony Forms </forms>` this is done
     automatically for you.
 
+.. _routing-matching-expressions:
+
 Matching Expressions
 ~~~~~~~~~~~~~~~~~~~~