Merge branch '6.4' into 7.2

* 6.4:
  Tweaks and rewords
  [Twig] [twig reference] add examples to functions (format_file, file_…

Author: javiereguiluz

reference/configuration/framework.rst

@@ -1920,6 +1920,8 @@ named ``kernel.http_method_override``.
         $request = Request::createFromGlobals();
         // ...
 
+.. _reference-framework-ide:
+
 ide
 ~~~
 

reference/twig_reference.rst

@@ -96,6 +96,11 @@ Returns an instance of ``ControllerReference`` to be used with functions
 like :ref:`render() <reference-twig-function-render>` and
 :ref:`render_esi() <reference-twig-function-render-esi>`.
 
+.. code-block:: html+twig
+
+    {{ render(controller('App\\Controller\\BlogController:latest', {max: 3})) }}
+    {# output: the content returned by the controller method; e.g. a rendered Twig template #}
+
 .. _reference-twig-function-asset:
 
 asset
@@ -171,6 +176,12 @@ csrf_token
 Renders a CSRF token. Use this function if you want :doc:`CSRF protection </security/csrf>`
 in a regular HTML form not managed by the Symfony Form component.
 
+.. code-block:: twig
+
+    {{ csrf_token('my_form') }}
+    {# output: a random alphanumeric string like:
+       a.YOosAd0fhT7BEuUCFbROzrvgkW8kpEmBDQ_DKRMUi2o.Va8ZQKt5_2qoa7dLW-02_PLYwDBx9nnWOluUHUFCwC5Zo0VuuVfQCqtngg #}
+
 is_granted
 ~~~~~~~~~~
 
@@ -818,6 +829,34 @@ Generates an excerpt of a code file around the given ``line`` number. The
 ``srcContext`` argument defines the total number of lines to display around the
 given line number (use ``-1`` to display the whole file).
 
+Consider the following as the content of ``file.txt``:
+
+.. code-block:: text
+
+    a
+    b
+    c
+    d
+    e
+
+.. code-block:: twig
+
+    {{ '/path/to/file.txt'|file_excerpt(line = 4, srcContext = 1) }}
+    {# output:
+        <ol start="3">
+            <li><a class="anchor" id="line3"></a><code>c</code></li>
+            <li class="selected"><a class="anchor" id="line4"></a><code>d</code></li>
+            <li><a class="anchor" id="line5"></a><code>e</code></li>
+        </ol>
+    #}
+
+    {{ '/path/to/file.txt'|file_excerpt(line = 1, srcContext = 0) }}
+    {# output:
+        <ol start="1">
+            <li class="selected"><a class="anchor" id="line1"></a><code>a</code></li>
+        </ol>
+    #}
+
 format_file
 ~~~~~~~~~~~
 
@@ -836,6 +875,29 @@ Generates the file path inside an ``<a>`` element. If the path is inside
 the kernel root directory, the kernel root directory path is replaced by
 ``kernel.project_dir`` (showing the full path in a tooltip on hover).
 
+.. code-block:: twig
+
+    {{ '/path/to/file.txt'|format_file(line = 1, text = "my_text") }}
+    {# output:
+        <a href="/path/to/file.txt#L1"
+            title="Click to open this file" class="file_link">my_text at line 1
+        </a>
+    #}
+
+    {{ "/path/to/file.txt"|format_file(line = 3) }}
+    {# output:
+        <a href="/path/to/file.txt&amp;line=3"
+            title="Click to open this file" class="file_link">/path/to/file.txt at line 3
+        </a>
+    #}
+
+.. tip::
+
+    If you set the :ref:`framework.ide <reference-framework-ide>` option, the
+    generated links will change to open the file in that IDE/editor. For example,
+    when using PhpStorm, the ``<a href="/path/to/file.txt&amp;line=3"`` link will
+    become ``<a href="phpstorm://open?file=/path/to/file.txt&amp;line=3"``.
+
 format_file_from_text
 ~~~~~~~~~~~~~~~~~~~~~