Merge branch '3.4' into 4.1

* 3.4:
  Change link to actual demo repo
  Remove unnecessary semicolons
  Change to short php echo tags
  [Encore] Make title in FAQ more clear
  [Forms] Update Bootstrap 4's documentation links to 4.1
  Mentioned how to redirect and maintain the query string
  Minimalist default PSR-3 logger
  Use cross references for internal links
  Added a note on forms validation
  Mentioned the <optgroup> html tag explicitly
  Update redis_adapter.rst

Author: javiereguiluz

best_practices/forms.rst

@@ -137,6 +137,35 @@ view layer:
         <input type="submit" class="btn" value="Create" />
     {{ 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/cache/adapters/redis_adapter.rst

@@ -92,7 +92,7 @@ array of ``key => value`` pairs representing option names and their respective v
     $client = RedisAdapter::createConnection(
 
         // provide a string dsn
-        'redis://localhost:6739',
+        'redis://localhost:6379',
 
         // associative array of configuration options
         array(

components/process.rst

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

components/templating.rst

@@ -54,7 +54,7 @@ which uses the template reference to actually find and load the template::
 .. code-block:: html+php
 
     <!-- views/hello.php -->
-    Hello, <?php echo $firstname ?>!
+    Hello, <?= $firstname ?>!
 
 The :method:`Symfony\\Component\\Templating\\PhpEngine::render` method parses
 the ``views/hello.php`` file and returns the output text. The second argument
@@ -85,7 +85,7 @@ to render the template originally) inside the template to render another templat
 
     <?php $names = array('Fabien', ...) ?>
     <?php foreach ($names as $name) : ?>
-        <?php echo $view->render('hello.php', array('firstname' => $name)) ?>
+        <?= $view->render('hello.php', array('firstname' => $name)) ?>
     <?php endforeach ?>
 
 Global Variables
@@ -103,7 +103,7 @@ In a template:
 
 .. code-block:: html+php
 
-    <p>The google tracking code is: <?php echo $ga_tracking ?></p>
+    <p>The google tracking code is: <?= $ga_tracking ?></p>
 
 .. caution::
 
@@ -123,13 +123,13 @@ JavaScript code isn't written out to your page. This will prevent things like
 XSS attacks. To do this, use the
 :method:`Symfony\\Component\\Templating\\PhpEngine::escape` method::
 
-    <?php echo $view->escape($firstname) ?>
+    <?= $view->escape($firstname) ?>
 
 By default, the ``escape()`` method assumes that the variable is outputted
 within an HTML context. The second argument lets you change the context. For
 example, to output something inside JavaScript, use the ``js`` context::
 
-    <?php echo $view->escape($var, 'js') ?>
+    <?= $view->escape($var, 'js') ?>
 
 The component comes with an HTML and JS escaper. You can register your own
 escaper using the

components/templating/slotshelper.rst

@@ -67,10 +67,10 @@ set in a slot is in the ``_content`` slot.
     <?php $view['slots']->set('title', $page->title) ?>
 
     <h1>
-        <?php echo $page->title ?>
+        <?= $page->title ?>
     </h1>
     <p>
-        <?php echo $page->body ?>
+        <?= $page->body ?>
     </p>
 
 .. note::

controller.rst

@@ -148,6 +148,9 @@ and ``redirect()`` methods::
         // redirect to a route with parameters
         return $this->redirectToRoute('app_lucky_number', array('max' => 10));
 
+        // 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');
     }

create_framework/front_controller.rst

@@ -190,7 +190,7 @@ And the ``hello.php`` script can now be converted to a template::
     <!-- example.com/src/pages/hello.php -->
     <?php $name = $request->get('name', 'World') ?>
 
-    Hello <?php echo htmlspecialchars($name, ENT_QUOTES, 'UTF-8') ?>
+    Hello <?= htmlspecialchars($name, ENT_QUOTES, 'UTF-8') ?>
 
 We have the first version of our framework::
 

create_framework/routing.rst

@@ -33,7 +33,7 @@ As we now extract the request query parameters, simplify the ``hello.php``
 template as follows::
 
     <!-- example.com/src/pages/hello.php -->
-    Hello <?php echo htmlspecialchars(isset($name) ? $name : 'World', ENT_QUOTES, 'UTF-8') ?>
+    Hello <?= htmlspecialchars(isset($name) ? $name : 'World', ENT_QUOTES, 'UTF-8') ?>
 
 Now, we are in good shape to add new features.
 
@@ -166,7 +166,7 @@ There are a few new things in the code:
 * Request attributes are extracted to keep our templates simple::
 
       <!-- example.com/src/pages/hello.php -->
-      Hello <?php echo htmlspecialchars($name, ENT_QUOTES, 'UTF-8') ?>
+      Hello <?= htmlspecialchars($name, ENT_QUOTES, 'UTF-8') ?>
 
 * Route configuration has been moved to its own file::
 

form/bootstrap4.rst

@@ -12,10 +12,10 @@ template which other templates extend from):
 
     {# beware that the blocks in your template may be named different #}
     {% block head_css %}
-        <!-- Copy CSS from https://getbootstrap.com/docs/4.0/getting-started/introduction/#css -->
+        <!-- Copy CSS from https://getbootstrap.com/docs/4.1/getting-started/introduction/#css -->
     {% endblock %}
     {% block head_js %}
-        <!-- Copy JavaScript from https://getbootstrap.com/docs/4.0/getting-started/introduction/#js -->
+        <!-- Copy JavaScript from https://getbootstrap.com/docs/4.1/getting-started/introduction/#js -->
     {% endblock %}
 
 If your application uses modern front-end practices, it's better to use
@@ -111,6 +111,6 @@ Form errors are rendered **inside** the ``<label>`` element to make sure there
 is a strong connection between the error and its ``<input>``, as required by the
 `WCAG 2.0 standard`_.
 
-.. _`their documentation`: https://getbootstrap.com/docs/4.0/
+.. _`their documentation`: https://getbootstrap.com/docs/4.1/
 .. _`WCAG 2.0 standard`: https://www.w3.org/TR/WCAG20/
-.. _`custom forms`: https://getbootstrap.com/docs/4.0/components/forms/#custom-forms
+.. _`custom forms`: https://getbootstrap.com/docs/4.1/components/forms/#custom-forms

form/form_customization.rst

@@ -857,6 +857,6 @@ more details about this concept in Twig, see :ref:`twig-reference-form-variables
 .. _`bootstrap_4_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
 .. _`bootstrap_4_horizontal_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
 .. _`Bootstrap 3 CSS framework`: https://getbootstrap.com/docs/3.3/
-.. _`Bootstrap 4 CSS framework`: https://getbootstrap.com/docs/4.0/
+.. _`Bootstrap 4 CSS framework`: https://getbootstrap.com/docs/4.1/
 .. _`foundation_5_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig
 .. _`Foundation CSS framework`: http://foundation.zurb.com/