Merge branch '3.4' into 4.3

* 3.4:
  remove additional blank line
  fix typo (backport #12653)
  Add isMasterRequest method
  Update MySQL column type definition
  Add some links to objects injected by Symfony in expressions

Author: xabbuh

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>`;
+* :doc:`Variables available in routing expressions </routing/conditions>`.

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::

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``