Merge branch '4.0' into 4.1

* 4.0:
  Remove redundant example configuration value
  Moved PHP-related code from Forms to the PHP templating page
  method name is 'index' not 'indexAction'

Author: javiereguiluz

create_framework/http_kernel_controller_resolver.rst

@@ -24,7 +24,7 @@ Update the route definition accordingly::
 
     $routes->add('leap_year', new Routing\Route('/is_leap_year/{year}', array(
         'year' => null,
-        '_controller' => array(new LeapYearController(), 'indexAction'),
+        '_controller' => array(new LeapYearController(), 'index'),
     )));
 
 The move is pretty straightforward and makes a lot of sense as soon as you
@@ -64,7 +64,7 @@ two colons and a method name as a valid callback, like 'class::method'::
 
     $routes->add('leap_year', new Routing\Route('/is_leap_year/{year}', array(
         'year' => null,
-        '_controller' => 'LeapYearController::indexAction',
+        '_controller' => 'LeapYearController::index',
     )));
 
 To make this code work, modify the framework code to use the controller

form/form_customization.rst

@@ -344,53 +344,10 @@ different than the one of your main form. Just specify both your themes:
 
     {% form_theme form.a_child_form 'form/fields_child.html.twig' %}
 
-Form Theming in PHP
--------------------
+.. _referencing-base-form-blocks-twig-specific:
 
-When using PHP as a templating engine, the only method to customize a fragment
-is to create a new template file - this is similar to the second method used by
-Twig.
-
-The template file must be named after the fragment. You must create a ``integer_widget.html.php``
-file in order to customize the ``integer_widget`` fragment.
-
-.. code-block:: html+php
-
-    <!-- src/Resources/integer_widget.html.php -->
-    <div class="integer_widget">
-        <?php echo $view['form']->block(
-            $form,
-            'form_widget_simple',
-            array('type' => isset($type) ? $type : "number")
-        ) ?>
-    </div>
-
-Now that you've created the customized form template, you need to tell Symfony
-to use it. Inside the template where you're actually rendering your form,
-tell Symfony to use the theme via the ``setTheme()`` helper method::
-
-    <?php $view['form']->setTheme($form, array(':form')); ?>
-
-    <?php $view['form']->widget($form['age']) ?>
-
-When the ``form.age`` widget is rendered, Symfony will use the customized
-``integer_widget.html.php`` template and the ``input`` tag will be wrapped in
-the ``div`` element.
-
-If you want to apply a theme to a specific child form, pass it to the ``setTheme()``
-method::
-
-    <?php $view['form']->setTheme($form['child'], ':form'); ?>
-
-.. note::
-
-    The ``:form`` syntax is based on the functional names for templates:
-    ``Bundle:Directory``. As the form directory lives in the
-    ``templates/`` directory, the ``Bundle`` part is empty, resulting
-    in ``:form``.
-
-Referencing base Form Blocks (Twig specific)
---------------------------------------------
+Referencing base Form Blocks
+----------------------------
 
 So far, to override a particular form block, the best method is to copy
 the default block from `form_div_layout.html.twig`_, paste it into a different template,
@@ -446,16 +403,15 @@ the base block by using the ``parent()`` Twig function:
     templating engine. You have to manually copy the content from the base block
     to your new template file.
 
+.. _twig:
+
 Making Application-wide Customizations
 --------------------------------------
 
 If you'd like a certain form customization to be global to your application,
 you can accomplish this by making the form customizations in an external
 template and then importing it inside your application configuration.
 
-Twig
-~~~~
-
 By using the following configuration, any customized form blocks inside the
 ``form/fields.html.twig`` template will be used globally when a form is
 rendered.
@@ -552,125 +508,6 @@ your template file rather than adding the template as a resource:
 Note that the ``form`` variable in the above code is the form view variable
 that you passed to your template.
 
-PHP
-~~~
-
-By using the following configuration, any customized form fragments inside the
-``templates/form`` folder will be used globally when a
-form is rendered.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # config/packages/framework.yaml
-        framework:
-            templating:
-                form:
-                    resources:
-                        - 'App:Form'
-            # ...
-
-    .. code-block:: xml
-
-        <!-- config/packages/framework.xml -->
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:framework="http://symfony.com/schema/dic/symfony"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services
-                http://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/symfony
-                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-            <framework:config>
-                <framework:templating>
-                    <framework:form>
-                        <framework:resource>App:Form</framework:resource>
-                    </framework:form>
-                </framework:templating>
-                <!-- ... -->
-            </framework:config>
-        </container>
-
-    .. code-block:: php
-
-        // config/packages/framework.php
-        // PHP
-        $container->loadFromExtension('framework', array(
-            'templating' => array(
-                'form' => array(
-                    'resources' => array(
-                        'App:Form',
-                    ),
-                ),
-             ),
-
-             // ...
-        ));
-
-By default, the PHP engine uses a *div* layout when rendering forms. Some people,
-however, may prefer to render forms in a *table* layout. Use the ``FrameworkBundle:FormTable``
-resource to use such a layout:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # config/packages/framework.yaml
-        framework:
-            templating:
-                form:
-                    resources:
-                        - 'FrameworkBundle:FormTable'
-
-    .. code-block:: xml
-
-        <!-- config/packages/framework.xml -->
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:framework="http://symfony.com/schema/dic/symfony"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services
-                http://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/symfony
-                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-            <framework:config>
-                <framework:templating>
-                    <framework:form>
-                        <resource>FrameworkBundle:FormTable</resource>
-                    </framework:form>
-                </framework:templating>
-                <!-- ... -->
-            </framework:config>
-        </container>
-
-    .. code-block:: php
-
-        // config/packages/framework.php
-        $container->loadFromExtension('framework', array(
-            'templating' => array(
-                'form' => array(
-                    'resources' => array(
-                        'FrameworkBundle:FormTable',
-                    ),
-                ),
-            ),
-
-             // ...
-        ));
-
-If you only want to make the change in one template, add the following line to
-your template file rather than adding the template as a resource:
-
-.. code-block:: html+php
-
-    <?php $view['form']->setTheme($form, array('FrameworkBundle:FormTable')); ?>
-
-Note that the ``$form`` variable in the above code is the form view variable
-that you passed to your template.
-
 How to Customize an individual Field
 ------------------------------------
 
@@ -908,7 +745,7 @@ Adding a "Required" Asterisk to Field Labels
 If you want to denote all of your required fields with a required asterisk (``*``),
 you can do this by customizing the ``form_label`` fragment.
 
-In Twig, if you're making the form customization inside the same template as your
+If you're making the form customization inside the same template as your
 form, modify the ``use`` tag and add the following:
 
 .. code-block:: html+twig
@@ -923,7 +760,7 @@ form, modify the ``use`` tag and add the following:
         {% endif %}
     {% endblock %}
 
-In Twig, if you're making the form customization inside a separate template, use
+If you're making the form customization inside a separate template, use
 the following:
 
 .. code-block:: html+twig
@@ -938,24 +775,6 @@ the following:
         {% endif %}
     {% endblock %}
 
-When using PHP as a templating engine you have to copy the content from the
-original template:
-
-.. code-block:: html+php
-
-    <!-- form_label.html.php -->
-
-    <!-- original content -->
-    <?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
-    <?php if (!$compound) { $label_attr['for'] = $id; } ?>
-    <?php if (!$label) { $label = $view['form']->humanize($name); } ?>
-    <label <?php foreach ($label_attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>
-
-    <!-- customization -->
-    <?php if ($required) : ?>
-        <span class="required" title="This field is required">*</span>
-    <?php endif ?>
-
 .. tip::
 
     See :ref:`form-theming-methods` for how to apply this customization.
@@ -976,7 +795,7 @@ Adding "help" Messages
 
 You can also customize your form widgets to have an optional "help" message.
 
-In Twig, if you're making the form customization inside the same template as your
+If you're making the form customization inside the same template as your
 form, modify the ``use`` tag and add the following:
 
 .. code-block:: html+twig
@@ -991,7 +810,7 @@ form, modify the ``use`` tag and add the following:
         {% endif %}
     {% endblock %}
 
-In Twig, if you're making the form customization inside a separate template, use
+If you're making the form customization inside a separate template, use
 the following:
 
 .. code-block:: html+twig
@@ -1006,25 +825,6 @@ the following:
         {% endif %}
     {% endblock %}
 
-When using PHP as a templating engine you have to copy the content from the
-original template:
-
-.. code-block:: html+php
-
-    <!-- form_widget_simple.html.php -->
-
-    <!-- Original content -->
-    <input
-        type="<?php echo isset($type) ? $view->escape($type) : 'text' ?>"
-        <?php if (!empty($value)): ?>value="<?php echo $view->escape($value) ?>"<?php endif ?>
-        <?php echo $view['form']->block($form, 'widget_attributes') ?>
-    />
-
-    <!-- Customization -->
-    <?php if (isset($help)) : ?>
-        <span class="help"><?php echo $view->escape($help) ?></span>
-    <?php endif ?>
-
 To render a help message below a field, pass in a ``help`` variable:
 
 .. code-block:: twig