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/

frontend/encore/faq.rst

@@ -8,7 +8,7 @@ How do I deploy my Encore Assets?
 
 There are two important things to remember when deploying your assets.
 
-**1) Run ``encore production``**
+**1) Compile assets for production**
 
 Optimize your assets for production by running:
 

logging.rst

@@ -1,24 +1,29 @@
-Logging with Monolog
-====================
+Logging
+=======
 
-Symfony integrates seamlessly with `Monolog`_, the most popular PHP logging
-library, to create and store log messages in a variety of different places.
-
-Installation
-------------
+Symfony comes with a minimalist `PSR-3`_ logger: :class:`Symfony\\Component\\HttpKernel\\Log\\Logger`.
+In conformance with `the twelve-factor app methodology`_, it sends messages starting from the
+``WARNING`` level to `stderr`_.
 
-In applications using :doc:`Symfony Flex </setup/flex>`, run this command to
-install the Monolog based logger before using it:
+The minimal log level can be changed by setting the ``SHELL_VERBOSITY`` environment variable:
 
-.. code-block:: terminal
+=========================  =================
+``SHELL_VERBOSITY`` value  Minimum log level
+=========================  =================
+``-1``                     ``ERROR``
+``1``                      ``NOTICE``
+``2``                      ``INFO``
+``3``                      ``DEBUG``
+=========================  =================
 
-    $ composer require symfony/monolog-bundle
+The minimum log level, the default output and the log format can also be changed by
+passing the appropriate arguments to the constructor of :class:`Symfony\\Component\\HttpKernel\\Log\\Logger`.
+To do so, :ref:`override the "logger" service definition <service-psr4-loader>`.
 
 Logging a Message
 -----------------
 
-If the application uses the :ref:`default services.yaml configuration <service-container-services-load-example>`,
-you can get the logger service injecting the ``LoggerInterface`` class::
+To log a message, inject the default logger in your controller::
 
     use Psr\Log\LoggerInterface;
 
@@ -35,12 +40,27 @@ you can get the logger service injecting the ``LoggerInterface`` class::
         // ...
     }
 
-The logger service has different methods for different logging levels/priorities.
-You can configure the logger to do different things based on the *level* of a message
-(e.g. :doc:`send an email when an error occurs </logging/monolog_email>`).
-
+The ``logger`` service has different methods for different logging levels/priorities.
 See LoggerInterface_ for a list of all of the methods on the logger.
 
+Monolog
+-------
+
+Symfony integrates seamlessly with `Monolog`_, the most popular PHP logging
+library, to create and store log messages in a variety of different places
+and trigger various actions.
+
+For instance, using Monolog you can configure the logger to do different things based on the
+*level* of a message (e.g. :doc:`send an email when an error occurs </logging/monolog_email>`).
+
+Run this command to install the Monolog based logger before using it:
+
+.. code-block:: terminal
+
+    $ composer require symfony/monolog-bundle
+
+The following sections assume that Monolog is installed.
+
 Where Logs are Stored
 ---------------------
 
@@ -349,6 +369,9 @@ Learn more
 
     logging/monolog_regex_based_excludes
 
+.. _`the twelve-factor app methodology`: https://12factor.net/logs
+.. _PSR-3: https://www.php-fig.org/psr/psr-3/
+.. _`stderr`: https://en.wikipedia.org/wiki/Standard_streams#Standard_error_(stderr)
 .. _Monolog: https://github.com/Seldaek/monolog
 .. _LoggerInterface: https://github.com/php-fig/log/blob/master/Psr/Log/LoggerInterface.php
 .. _`logrotate`: https://github.com/logrotate/logrotate

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

@@ -68,6 +68,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/button_label.rst.inc

@@ -14,4 +14,4 @@ be directly set inside the template:
 
     .. code-block:: html+php
 
-        <?php echo $view['form']->widget($form['save'], array('label' => 'Click me')) ?>
+        <?= $view['form']->widget($form['save'], array('label' => 'Click me')) ?>

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

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

@@ -60,6 +60,6 @@ when rendering the field:
 
     .. code-block:: php
 
-        <?php echo $view['form']->widget($form['publishAt'], array(
+        <?= $view['form']->widget($form['publishAt'], array(
                   'separator' => '====='
         )) ?>

security.rst

@@ -992,7 +992,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

@@ -161,5 +161,5 @@ Go Deeper with Setup
 
 .. _`Stellar Development with Symfony`: http://symfonycasts.com/screencast/symfony
 .. _`Composer`: https://getcomposer.org/
-.. _`The Symfony Demo application`: https://github.com/symfony/symfony-demo
+.. _`The Symfony Demo application`: https://github.com/symfony/demo
 .. _`symfony/symfony-demo`: https://github.com/symfony/demo

templating.rst

@@ -35,13 +35,13 @@ template - a text file parsed by PHP that contains a mix of text and PHP code:
             <title>Welcome to Symfony!</title>
         </head>
         <body>
-            <h1><?php echo $page_title ?></h1>
+            <h1><?= $page_title ?></h1>
 
             <ul id="navigation">
                 <?php foreach ($navigation as $item): ?>
                     <li>
-                        <a href="<?php echo $item->getHref() ?>">
-                            <?php echo $item->getCaption() ?>
+                        <a href="<?= $item->getHref() ?>">
+                            <?= $item->getCaption() ?>
                         </a>
                     </li>
                 <?php endforeach ?>