Merge branch '2.8' into 3.4

* 2.8:
  Change link to actual demo repo
  Remove unnecessary semicolons
  Mentioned how to redirect and maintain the query string
  Use cross references for internal links
  Added a note on forms validation
  Mentioned the <optgroup> html tag explicitly

Author: javiereguiluz

best_practices/forms.rst

@@ -146,6 +146,35 @@ view layer:
                class="btn btn-default pull-right" />
     {{ form_end(form) }}
 
+Validation
+----------
+
+The :ref:`constraints <reference-form-option-constraints>` option allows you to
+attach :doc:`validation constraints </reference/constraints>` to any form field.
+However, doing that prevents the validation from being reused in other forms or
+other places where the mapped object is used.
+
+.. best-practice::
+
+    Do not define your validation constraints in the form but on the object the
+    form is mapped to.
+
+For example, to validate that the title of the post edited with a form is not
+blank, add the following in the ``Post`` object::
+
+    // src/Entity/Post.php
+
+    // ...
+    use Symfony\Component\Validator\Constraints as Assert;
+
+    class Post
+    {
+        /**
+         * @Assert\NotBlank()
+         */
+        public $title;
+    }
+
 Rendering the Form
 ------------------
 

components/process.rst

@@ -312,7 +312,7 @@ instead::
     use Symfony\Component\Process\PhpProcess;
 
     $process = new PhpProcess(<<<EOF
-        <?= 'Hello World'; ?>
+        <?= 'Hello World' ?>
     EOF
     );
     $process->run();

controller.rst

@@ -183,6 +183,9 @@ and ``redirect()`` methods::
         // redirects to a route with parameters
         return $this->redirectToRoute('blog_show', array('slug' => 'my-page'));
 
+        // redirects to a route and mantains the original query string parameters
+        return $this->redirectToRoute('blog_show', $request->query->all());
+
         // redirects externally
         return $this->redirect('http://symfony.com/doc');
     }

reference/forms/types/choice.rst

@@ -129,7 +129,8 @@ text that's shown to the user. But that can be completely customized via the
 Grouping Options
 ----------------
 
-You can easily "group" options in a select by passing a multi-dimensional choices array::
+You can group the ``<option>`` elements of a ``<select>`` into ``<optgroup>``
+by passing a multi-dimensional ``choices`` array::
 
     use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
     // ...

reference/forms/types/form.rst

@@ -67,6 +67,8 @@ option on the form.
 
 .. include:: /reference/forms/types/options/compound.rst.inc
 
+.. _reference-form-option-constraints:
+
 .. include:: /reference/forms/types/options/constraints.rst.inc
 
 .. include:: /reference/forms/types/options/data.rst.inc

reference/forms/types/options/group_by.rst.inc

@@ -3,9 +3,9 @@ group_by
 
 **type**: ``array``, ``callable`` or ``string`` **default**: ``null``
 
-You can easily "group" options in a select simply by passing a multi-dimensional
-array to ``choices``. See the :ref:`Grouping Options <form-choices-simple-grouping>`
-section about that.
+You can group the ``<option>`` elements of a ``<select>`` into ``<optgroup>``
+by passing a multi-dimensional array to ``choices``. See the
+:ref:`Grouping Options <form-choices-simple-grouping>` section about that.
 
 The ``group_by`` option is an alternative way to group choices, which gives you
 a bit more flexibility.
@@ -32,7 +32,7 @@ Take the following example::
     ));
 
 This groups the dates that are within 3 days into "Soon" and everything else into
-a "Later" group:
+a "Later" ``<optgroup>``:
 
 .. image:: /_images/reference/form/choice-example5.png
    :align: center

security.rst

@@ -955,7 +955,7 @@ You can also use expressions inside your templates:
             '"ROLE_ADMIN" in roles or (not is_anonymous() and user.isSuperAdmin())'
         ))): ?>
             <a href="...">Delete</a>
-        <?php endif; ?>
+        <?php endif ?>
 
 For more details on expressions and security, see :doc:`/security/expressions`.
 

setup.rst

@@ -322,7 +322,7 @@ Go Deeper with Setup
 .. _`Composer`: https://getcomposer.org/
 .. _`Phar extension`: https://php.net/manual/en/intro.phar.php
 .. _`Symfony Standard Edition`: https://github.com/symfony/symfony-standard
-.. _`The Symfony Demo application`: https://github.com/symfony/symfony-demo
+.. _`The Symfony Demo application`: https://github.com/symfony/demo
 .. _`The Symfony CMF Standard Edition`: https://github.com/symfony-cmf/standard-edition
 .. _`Symfony CMF`: http://cmf.symfony.com/
 .. _`The Symfony REST Edition`: https://github.com/gimler/symfony-rest-edition

templating/PHP.rst

@@ -407,7 +407,7 @@ 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']->setTheme($form, array(':form')) ?>
 
     <?php $view['form']->widget($form['age']) ?>
 
@@ -418,7 +418,7 @@ 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'); ?>
+    <?php $view['form']->setTheme($form['child'], ':form') ?>
 
 .. note::
 
@@ -545,7 +545,7 @@ your template file rather than adding the template as a resource:
 
 .. code-block:: html+php
 
-    <?php $view['form']->setTheme($form, array('FrameworkBundle:FormTable')); ?>
+    <?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.