Merge branch '2.7' into 2.8

* 2.7:
  Minor rewords
  Update session_configuration.rst
  [symfony#7522] minor wording improvement
  Improved the image for Doctrine + Web Debug Toolbar
  Update bundles/configuration.rst
  fix usage of the session flag bag API
  Add caution related to deprecate mail transport
  Use https URLs when possible
  [Requirements] Clarify what are JSON and ctype
  Proposed a minor reword
  Added information about injecting a logger to your service

Author: xabbuh

_images/doctrine/doctrine_web_debug_toolbar.png

@@ -83,7 +83,7 @@ bundle configuration would look like:
         <?xml version="1.0" ?>
 
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:acme-social="http://example.org/dic/schema/acme_social"
+            xmlns:acme-social="http://example.org/schema/dic/acme_social"
             xsi:schemaLocation="http://symfony.com/schema/dic/services
                 http://symfony.com/schema/dic/services/services-1.0.xsd">
 

_images/doctrine/web_debug_toolbar.png

@@ -139,6 +139,20 @@ the ``php.ini`` directive ``session.gc_maxlifetime``. The meaning in this contex
 that any stored session that was saved more than ``gc_maxlifetime`` ago should be
 deleted. This allows one to expire records based on idle time.
 
+However, some operating systems do their own session handling and set the
+``session.gc_probability`` variable to ``0`` to stop PHP doing garbage
+collection. That's why Symfony now overwrites this value to ``1``.
+
+If you wish to use the original value set in your ``php.ini``, add the following
+configuration:
+
+.. code-block:: yaml
+
+    # config.yml
+    framework:
+        session:
+            gc_probability: null
+
 You can configure these settings by passing ``gc_probability``, ``gc_divisor``
 and ``gc_maxlifetime`` in an array to the constructor of
 :class:`Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage`

bundles/configuration.rst

@@ -444,14 +444,14 @@ read any flash messages from the session:
         <!-- app/Resources/views/base.html.php -->
 
         // you can read and display just one flash message type...
-        <?php foreach ($view['session']->getFlash('notice') as $message): ?>
+        <?php foreach ($view['session']->getFlashBag()->get('notice') as $message): ?>
             <div class="flash-notice">
                 <?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 ($view['session']->getFlashBag()->all() as $type => $flash_messages): ?>
             <?php foreach ($flash_messages as $flash_message): ?>
                 <div class="flash-<?php echo $type ?>">
                     <?php echo $message ?>

components/http_foundation/session_configuration.rst

@@ -662,19 +662,17 @@ to easily fetch objects based on multiple conditions::
 
 .. tip::
 
-    When you render any page, you can see how many queries were made in the
-    bottom right corner of the web debug toolbar.
+    When rendering a page requires to make some database calls, the web debug
+    toolbar at the bottom of the page displays the number of queries and the
+    time it took to execute them:
 
-    .. image:: /_images/doctrine/web_debug_toolbar.png
+    .. image:: /_images/doctrine/doctrine_web_debug_toolbar.png
        :align: center
-       :scale: 50
-       :width: 350
+       :class: with-browser
 
-    If you click the icon, the profiler will open, showing you the exact
-    queries that were made.
-
-    The icon will turn yellow if there were more than 50 queries on the
-    page. This could indicate that something is not correct.
+    If the number of database queries is too high, the icon will turn yellow to
+    indicate that something may not be correct. Click on the icon to open the
+    Symfony Profiler and see the exact queries that were executed.
 
 Updating an Object
 ~~~~~~~~~~~~~~~~~~

controller.rst

@@ -86,6 +86,12 @@ The following configuration attributes are available:
 * ``delivery_addresses`` (an array of email addresses where to send ALL emails)
 * ``disable_delivery`` (set to true to disable delivery completely)
 
+.. caution::
+
+    Starting from SwiftMailer 5.4.5, the ``mail`` transport is deprecated
+    and will be removed in version 6. Consider using another transport like
+    ``smtp``, ``sendmail`` or ``gmail``.
+
 Sending Emails
 --------------
 

doctrine.rst

@@ -308,6 +308,15 @@ option of your handler to ``rotating_file``:
             ),
         ));
 
+Using a Logger inside a Service
+-------------------------------
+
+To use a logger in your own services, add the ``@logger`` service as an argument
+of those services. If you want to use a pre-configured logger which uses a
+specific channel (``app`` by default), use the ``monolog.logger`` tag  with the
+``channel`` property as explained in the
+:ref:`Dependency Injection reference <dic_tags-monolog>`.
+
 Adding extra Data to each Log (e.g. a unique request token)
 -----------------------------------------------------------
 

email.rst

@@ -22,8 +22,8 @@ Required
 --------
 
 * PHP needs to be a minimum version of PHP 5.3.9
-* JSON needs to be enabled
-* ctype needs to be enabled
+* `JSON extension`_ needs to be enabled
+* `ctype extension`_ needs to be enabled
 * Your ``php.ini`` needs to have the ``date.timezone`` setting
 
 .. caution::
@@ -57,3 +57,5 @@ you need to have the PDO driver installed for the database server you want
 to use.
 
 .. _`Requirements section of the README`: https://github.com/symfony/symfony/blob/2.8/README.md#requirements
+.. _`JSON extension`: https://php.net/manual/book.json.php
+.. _`ctype extension`: https://php.net/manual/book.ctype.php