Merge branch '3.4' into 4.0

* 3.4:
  Removed more PHP template examples

Author: javiereguiluz

controller.rst

@@ -477,47 +477,25 @@ you'll use this key to retrieve the message.
 In the template of the next page (or even better, in your base layout template),
 read any flash messages from the session using ``app.flashes()``:
 
-.. configuration-block::
+.. code-block:: html+twig
 
-    .. code-block:: html+twig
+    {# templates/base.html.twig #}
 
-        {# templates/base.html.twig #}
+    {# you can read and display just one flash message type... #}
+    {% for message in app.flashes('notice') %}
+        <div class="flash-notice">
+            {{ message }}
+        </div>
+    {% endfor %}
 
-        {# you can read and display just one flash message type... #}
-        {% for message in app.flashes('notice') %}
-            <div class="flash-notice">
+    {# ...or you can read and display every flash message available #}
+    {% for label, messages in app.flashes %}
+        {% for message in messages %}
+            <div class="flash-{{ label }}">
                 {{ message }}
             </div>
         {% endfor %}
-
-        {# ...or you can read and display every flash message available #}
-        {% for label, messages in app.flashes %}
-            {% for message in messages %}
-                <div class="flash-{{ label }}">
-                    {{ message }}
-                </div>
-            {% endfor %}
-        {% endfor %}
-
-    .. code-block:: html+php
-
-        <!-- templates/base.html.php -->
-
-        // you can read and display just one flash message type...
-        <?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']->getFlashBag()->all() as $type => $flash_messages): ?>
-            <?php foreach ($flash_messages as $flash_message): ?>
-                <div class="flash-<?php echo $type ?>">
-                    <?php echo $message ?>
-                </div>
-            <?php endforeach ?>
-        <?php endforeach ?>
+    {% endfor %}
 
 It's common to use ``notice``, ``warning`` and ``error`` as the keys of the
 different types of flash messages, but you can use any key that fits your

forms.rst

@@ -149,21 +149,12 @@ done by passing a special form "view" object to your template (notice the
 ``$form->createView()`` in the controller above) and using a set of form
 helper functions:
 
-.. configuration-block::
-
-    .. code-block:: html+twig
-
-        {# templates/default/new.html.twig #}
-        {{ form_start(form) }}
-        {{ form_widget(form) }}
-        {{ form_end(form) }}
-
-    .. code-block:: html+php
+.. code-block:: html+twig
 
-        <!-- templates/default/new.html.php -->
-        <?php echo $view['form']->start($form) ?>
-        <?php echo $view['form']->widget($form) ?>
-        <?php echo $view['form']->end($form) ?>
+    {# templates/default/new.html.twig #}
+    {{ form_start(form) }}
+    {{ form_widget(form) }}
+    {{ form_end(form) }}
 
 .. image:: /_images/form/simple-form.png
     :align: center
@@ -429,21 +420,12 @@ Validation is a very powerful feature of Symfony and has its own
     but are being prevented by your browser from, for example, submitting
     blank fields.
 
-    .. configuration-block::
-
-        .. code-block:: html+twig
-
-            {# templates/default/new.html.twig #}
-            {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
-            {{ form_widget(form) }}
-            {{ form_end(form) }}
-
-        .. code-block:: html+php
+    .. code-block:: html+twig
 
-            <!-- templates/default/new.html.php -->
-            <?php echo $view['form']->start($form, array('attr' => array('novalidate' => 'novalidate') ?>
-            <?php echo $view['form']->widget($form) ?>
-            <?php echo $view['form']->end($form) ?>
+        {# templates/default/new.html.twig #}
+        {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
+        {{ form_widget(form) }}
+        {{ form_end(form) }}
 
 .. index::
    single: Forms; Built-in field types

reference/configuration/framework.rst

@@ -1060,15 +1060,9 @@ You can group assets into packages, to specify different base URLs for them:
 
 Now you can use the ``avatars`` package in your templates:
 
-.. configuration-block:: php
+.. code-block:: html+twig
 
-    .. code-block:: html+twig
-
-        <img src="{{ asset('...', 'avatars') }}">
-
-    .. code-block:: html+php
-
-        <img src="<?php echo $view['assets']->getUrl('...', 'avatars') ?>">
+    <img src="{{ asset('...', 'avatars') }}">
 
 Each package can configure the following options:
 
@@ -1094,15 +1088,9 @@ equivalent) as well as assets rendered with Assetic.
 
 For example, suppose you have the following:
 
-.. configuration-block::
-
-    .. code-block:: html+twig
-
-        <img src="{{ asset('images/logo.png') }}" alt="Symfony!" />
-
-    .. code-block:: php
+.. code-block:: html+twig
 
-        <img src="<?php echo $view['assets']->getUrl('images/logo.png') ?>" alt="Symfony!" />
+    <img src="{{ asset('images/logo.png') }}" alt="Symfony!" />
 
 By default, this will render a path to your image such as ``/images/logo.png``.
 Now, activate the ``version`` option:

reference/forms/twig_reference.rst

@@ -297,21 +297,12 @@ reference the variables on the ``name`` field, accessing the variables is
 done by using a public ``vars`` property on the
 :class:`Symfony\\Component\\Form\\FormView` object:
 
-.. configuration-block::
+.. code-block:: html+twig
 
-    .. code-block:: html+twig
-
-        <label for="{{ form.name.vars.id }}"
-            class="{{ form.name.vars.required ? 'required' : '' }}">
-            {{ form.name.vars.label }}
-        </label>
-
-    .. code-block:: html+php
-
-        <label for="<?php echo $view['form']->get('name')->vars['id'] ?>"
-            class="<?php echo $view['form']->get('name')->vars['required'] ? 'required' : '' ?>">
-            <?php echo $view['form']->get('name')->vars['label'] ?>
-        </label>
+    <label for="{{ form.name.vars.id }}"
+        class="{{ form.name.vars.required ? 'required' : '' }}">
+        {{ form.name.vars.label }}
+    </label>
 
 +------------------------+-------------------------------------------------------------------------------------+
 | Variable               | Usage                                                                               |

reference/forms/types/collection.rst

@@ -68,47 +68,25 @@ address as its own input text box::
 
 The simplest way to render this is all at once:
 
-.. configuration-block::
+.. code-block:: twig
 
-    .. code-block:: twig
-
-        {{ form_row(form.emails) }}
-
-    .. code-block:: php
-
-        <?php echo $view['form']->row($form['emails']) ?>
+    {{ form_row(form.emails) }}
 
 A much more flexible method would look like this:
 
-.. configuration-block::
-
-    .. code-block:: html+twig
-
-        {{ form_label(form.emails) }}
-        {{ form_errors(form.emails) }}
-
-        <ul>
-        {% for emailField in form.emails %}
-            <li>
-                {{ form_errors(emailField) }}
-                {{ form_widget(emailField) }}
-            </li>
-        {% endfor %}
-        </ul>
-
-    .. code-block:: html+php
+.. code-block:: html+twig
 
-        <?php echo $view['form']->label($form['emails']) ?>
-        <?php echo $view['form']->errors($form['emails']) ?>
+    {{ form_label(form.emails) }}
+    {{ form_errors(form.emails) }}
 
-        <ul>
-        <?php foreach ($form['emails'] as $emailField): ?>
-            <li>
-                <?php echo $view['form']->errors($emailField) ?>
-                <?php echo $view['form']->widget($emailField) ?>
-            </li>
-        <?php endforeach ?>
-        </ul>
+    <ul>
+    {% for emailField in form.emails %}
+        <li>
+            {{ form_errors(emailField) }}
+            {{ form_widget(emailField) }}
+        </li>
+    {% endfor %}
+    </ul>
 
 In both cases, no input fields would render unless your ``emails`` data
 array already contained some emails.
@@ -367,15 +345,9 @@ be added to your underlying array due to the `allow_add`_ option.
 The prototype field can be rendered via the ``prototype`` variable in the
 collection field:
 
-.. configuration-block::
-
-    .. code-block:: twig
-
-        {{ form_row(form.emails.vars.prototype) }}
-
-    .. code-block:: php
+.. code-block:: twig
 
-        <?php echo $view['form']->row($form['emails']->vars['prototype']) ?>
+    {{ form_row(form.emails.vars.prototype) }}
 
 Note that all you really need is the "widget", but depending on how you're
 rendering your form, having the entire "form row" may be easier for you.

reference/forms/types/repeated.rst

@@ -68,30 +68,17 @@ The repeated field type is actually two underlying fields, which you can
 render all at once, or individually. To render all at once, use something
 like:
 
-.. configuration-block::
+.. code-block:: twig
 
-    .. code-block:: twig
-
-        {{ form_row(form.password) }}
-
-    .. code-block:: php
-
-        <?php echo $view['form']->row($form['password']) ?>
+    {{ form_row(form.password) }}
 
 To render each field individually, use something like this:
 
-.. configuration-block::
-
-    .. code-block:: twig
-
-        {# .first and .second may vary in your use - see the note below #}
-        {{ form_row(form.password.first) }}
-        {{ form_row(form.password.second) }}
-
-    .. code-block:: php
+.. code-block:: twig
 
-        <?php echo $view['form']->row($form['password']['first']) ?>
-        <?php echo $view['form']->row($form['password']['second']) ?>
+    {# .first and .second may vary in your use - see the note below #}
+    {{ form_row(form.password.first) }}
+    {{ form_row(form.password.second) }}
 
 .. note::
 

security.rst

@@ -913,19 +913,11 @@ Access Control in Templates
 If you want to check if the current user has a role inside a template, use
 the built-in ``is_granted()`` helper function:
 
-.. configuration-block::
-
-    .. code-block:: html+twig
-
-        {% if is_granted('ROLE_ADMIN') %}
-            <a href="...">Delete</a>
-        {% endif %}
-
-    .. code-block:: html+php
+.. code-block:: html+twig
 
-        <?php if ($view['security']->isGranted('ROLE_ADMIN')): ?>
-            <a href="...">Delete</a>
-        <?php endif ?>
+    {% if is_granted('ROLE_ADMIN') %}
+        <a href="...">Delete</a>
+    {% endif %}
 
 Securing other Services
 .......................
@@ -1098,19 +1090,11 @@ Retrieving the User in a Template
 In a Twig Template this object can be accessed via the :ref:`app.user <reference-twig-global-app>`
 key:
 
-.. configuration-block::
-
-    .. code-block:: html+twig
-
-        {% if is_granted('IS_AUTHENTICATED_FULLY') %}
-            <p>Username: {{ app.user.username }}</p>
-        {% endif %}
+.. code-block:: html+twig
 
-    .. code-block:: html+php
-
-        <?php if ($view['security']->isGranted('IS_AUTHENTICATED_FULLY')): ?>
-            <p>Username: <?php echo $app->getUser()->getUsername() ?></p>
-        <?php endif; ?>
+    {% if is_granted('IS_AUTHENTICATED_FULLY') %}
+        <p>Username: {{ app.user.username }}</p>
+    {% endif %}
 
 .. _security-logging-out: