Merge remote-tracking branch 'upstream/2.7' into 2.7

javiereguiluz · javiereguiluz · commit 76b5a21da295 · 2017-08-01T11:27:45.000+02:00
diff --git a/components/yaml/yaml_format.rst b/components/yaml/yaml_format.rst
@@ -300,4 +300,22 @@ Comments can be added in YAML by prefixing them with a hash mark (``#``):
     Comments are simply ignored by the YAML parser and do not need to be
     indented according to the current level of nesting in a collection.
 
+Explicit Typing
+---------------
+
+The YAML specification defines some tags to set the type of any data explicitly:
+
+.. code-block:: yaml
+
+    data:
+        # this value is parsed as a float number (it will be 3.0 instead of 3)
+        price: !!float 3
+
+        # this value is parsed as binary data encoded in base64
+        picture: !!binary |
+            R0lGODlhDAAMAIQAAP//9/X
+            17unp5WZmZgAAAOfn515eXv
+            Pz7Y6OjuDg4J+fn5OTk6enp
+            56enmleECcgggoBADs=
+
 .. _YAML: http://yaml.org/
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -214,5 +214,58 @@ interface and have an event method for each event it subscribes to::
 
 For a full reference, see chapter `The Event System`_ in the Doctrine documentation.
 
+Lazy loading for Event Listeners
+--------------------------------
+
+One subtle difference between listeners and subscribers is that Symfony can load 
+entity listeners lazily. This means that your listener class will only be fetched
+from the service container (and thus be instantiated) once the event it is linked
+to actually fires.
+
+Lazy loading might give you a slight performance improvement when your listener 
+runs for events that rarely fire. Also, it can help you when you run into 
+*circular dependency issues* that may occur when your listener service in turn
+depends on the DBAL connection. 
+
+To mark a listener service as lazily loaded, just add the ``lazy`` attribute
+to the tag like so:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        services:
+            my.listener:
+                class: AppBundle\EventListener\SearchIndexer
+                tags:
+                    - { name: doctrine.event_listener, event: postPersist, lazy: true }
+
+    .. code-block:: xml
+
+        <?xml version="1.0" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:doctrine="http://symfony.com/schema/dic/doctrine">
+
+            <services>
+                <service id="my.listener" class="AppBundle\EventListener\SearchIndexer">
+                    <tag name="doctrine.event_listener" event="postPersist" lazy="true" />
+                </service>
+            </services>
+        </container>
+
+    .. code-block:: php
+
+        use AppBundle\EventListener\SearchIndexer;
+
+        $container
+            ->register('my.listener', SearchIndexer::class)
+            ->addTag('doctrine.event_listener', array('event' => 'postPersist', 'lazy' => 'true'))
+        ;
+
+.. note::
+
+    Marking an event listener as ``lazy`` has nothing to do with lazy service
+    definitions which are described :doc:`in their own section </service_container/lazy_services>`
+
 .. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
 .. _`the Doctrine Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#entity-listeners
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -53,6 +53,16 @@ TwigBundle Configuration ("twig")
             paths:
                 '%kernel.root_dir%/../vendor/acme/foo-bar/templates': foo_bar
 
+            # The following were added in Symfony 2.7.
+            date:
+                format: d.m.Y, H:i:s
+                interval_format: '%%d days'
+                timezone: Asia/Tokyo
+            number_format:
+                decimals: 2
+                decimal_point: ','
+                thousands_separator: '.'
+
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
@@ -79,6 +89,9 @@ TwigBundle Configuration ("twig")
 
                 <twig:global key="foo" id="bar" type="service" />
                 <twig:global key="pi">3.14</twig:global>
+                
+                <twig:date format="d.m.Y, H:i:s" interval-format="%d days" timezone="Asia/Tokyo" />
+                <twig:number-format decimals="2" decimal-point="," thousands-separator="." />
 
                 <twig:exception-controller>AcmeFooBundle:Exception:showException</twig:exception-controller>
                 <twig:path namespace="foo_bar">%kernel.root_dir%/../vendor/acme/foo-bar/templates</twig:path>
@@ -92,23 +105,33 @@ TwigBundle Configuration ("twig")
             'form_themes' => array(
                 'form_div_layout.html.twig', // Default
                 'form.html.twig',
-             ),
-             'globals' => array(
-                 'foo' => '@bar',
-                 'pi'  => 3.14,
-             ),
-             'auto_reload'          => '%kernel.debug%',
-             'autoescape'           => 'name',
-             'base_template_class'  => 'Twig_Template',
-             'cache'                => '%kernel.cache_dir%/twig',
-             'charset'              => '%kernel.charset%',
-             'debug'                => '%kernel.debug%',
-             'strict_variables'     => false,
-             'exception_controller' => 'AcmeFooBundle:Exception:showException',
-             'optimizations'        => true,
-             'paths' => array(
-                 '%kernel.root_dir%/../vendor/acme/foo-bar/templates' => 'foo_bar',
-             ),
+            ),
+            'globals' => array(
+                'foo' => '@bar',
+                'pi'  => 3.14,
+            ),
+            'auto_reload'          => '%kernel.debug%',
+            'autoescape'           => 'name',
+            'base_template_class'  => 'Twig_Template',
+            'cache'                => '%kernel.cache_dir%/twig',
+            'charset'              => '%kernel.charset%',
+            'debug'                => '%kernel.debug%',
+            'strict_variables'     => false,
+            'exception_controller' => 'AcmeFooBundle:Exception:showException',
+            'optimizations'        => true,
+            'paths' => array(
+                '%kernel.root_dir%/../vendor/acme/foo-bar/templates' => 'foo_bar',
+            ),
+            'date' => array(
+                'format' => 'd.m.Y, H:i:s',
+                'interval_format' => '%%d days',
+                'timezone' => 'Asia/Tokyo',
+            ),
+            'number_format' => array(
+                'decimals' => 2,
+                'decimal_point' => ',',
+                'thousands_separator' => '.',
+            ),
         ));
 
 .. caution::
@@ -208,6 +231,37 @@ charset
 The charset used by the template files. In the Symfony Standard edition this
 defaults to the ``UTF-8`` charset.
 
+date
+~~~~
+
+These options define the default values used by the ``date`` filter to format
+date and time values. They are useful to avoid passing the same arguments on
+every ``date`` filter call.
+
+format
+......
+
+**type**: ``string`` **default**: ``F j, Y H:i``
+
+The format used by the ``date`` filter to display values when no specific format
+is passed as argument.
+
+internal_format
+...............
+
+**type**: ``string`` **default**: ``%d days``
+
+The format used by the ``date`` filter to display ``DateInterval`` instances
+when no specific format is passed as argument.
+
+timezone
+........
+
+**type**: ``string`` **default**: (the value returned by ``date_default_timezone_get()``)
+
+The timezone used when formatting date values with the ``date`` filter and no
+specific timezone is passed as argument.
+
 debug
 ~~~~~
 
@@ -232,6 +286,38 @@ option is advanced. If you need to customize an error page you should use
 the previous link. If you need to perform some behavior on an exception,
 you should add a listener to the ``kernel.exception`` event (see :ref:`dic-tags-kernel-event-listener`).
 
+number_format
+~~~~~~~~~~~~~
+
+These options define the default values used by the ``number_format`` filter to
+format numeric values. They are useful to avoid passing the same arguments on
+every ``number_format`` filter call.
+
+decimals
+........
+
+**type**: ``integer`` **default**: ``0``
+
+The number of decimals used to format numeric values when no specific number is
+passed as argument to the ``number_format`` filter.
+
+decimal_point
+.............
+
+**type**: ``string`` **default**: ``.``
+
+The character used to separate the decimals from the integer part of numeric
+values when no specific character is passed as argument to the ``number_format``
+filter.
+
+thousands_separator
+...................
+
+**type**: ``string`` **default**: ``,``
+
+The character used to separate every group of thousands in numeric values when
+no specific character is passed as argument to the ``number_format`` filter.
+
 optimizations
 ~~~~~~~~~~~~~
 
diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst
@@ -13,7 +13,8 @@ in the `International Components for Unicode`_ (e.g. ``fr`` or ``zh_Hant``).
 
 .. note::
 
-   The locale of your user is guessed using :phpmethod:`Locale::getDefault`
+   The locale of your user is guessed using :phpmethod:`Locale::getDefault`,
+   which requires the ``intl`` PHP extension to be installed and enabled.
 
 Unlike the ``choice`` type, you don't need to specify a ``choices`` or
 ``choice_list`` option as the field type automatically uses a large list
