Merge branch '3.2' into 3.3

* 3.2:
  Update custom_constraint.rst
  [#8087] fix merge
  Updated language for annouce event
  Update form best practises regarding Form::isValid
  Add form_theme in error customization
  Typo: lowercase letter
  Wrap the instantiation in parenthesis, and chain away
  fix variable being overwritten

Author: xabbuh

best_practices/forms.rst

@@ -204,7 +204,6 @@ and a ``createAction()`` that *only* processes the form submit. Both those
 actions will be almost identical. So it's much simpler to let ``newAction()``
 handle everything.
 
-Second, we recommend using ``$form->isSubmitted()`` in the ``if`` statement
-for clarity. This isn't technically needed, since ``isValid()`` first calls
-``isSubmitted()``. But without this, the flow doesn't read well as it *looks*
-like the form is *always* processed (even on the GET request).
+Second, is it required to call ``$form->isSubmitted()`` in the ``if`` statement
+before calling ``isValid()``. Calling ``isValid()`` with an unsubmitted form
+is deprecated since version 3.2 and will throw an exception in 4.0.

email.rst

@@ -103,7 +103,7 @@ an email is pretty straightforward::
 
     public function indexAction($name, \Swift_Mailer $mailer)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(

email/dev_environment.rst

@@ -100,7 +100,7 @@ Now, suppose you're sending an email to ``recipient@example.com``.
 
     public function indexAction($name, \Swift_Mailer $mailer)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(

email/testing.rst

@@ -14,7 +14,7 @@ Start with an easy controller action that sends an email::
 
     public function sendEmailAction($name, \Swift_Mailer $mailer)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody('You should see me from the profiler!')

form/form_customization.rst

@@ -873,6 +873,8 @@ and customize the ``form_errors`` fragment.
 
     .. code-block:: html+twig
 
+        {% form_theme form _self %}
+
         {# form_errors.html.twig #}
         {% block form_errors %}
             {% spaceless %}
@@ -933,6 +935,8 @@ fields (e.g. a whole form), and not just an individual field.
 
     .. code-block:: html+twig
 
+        {% form_theme form _self %}
+
         {# form_errors.html.twig #}
         {% block form_errors %}
             {% spaceless %}

performance.rst

@@ -138,13 +138,15 @@ If you're using the Standard Distribution, make the following changes::
     
     use Symfony\Component\ClassLoader\ApcClassLoader;
 
-    $loader = require __DIR__.'/../app/autoload.php';
+    // do not use $loader as a variable name here as it would
+    // be overwritten when loading the bootstrap.php.cache file
+    $classLoader = require __DIR__.'/../app/autoload.php';
     include_once __DIR__.'/../app/bootstrap.php.cache';
 
     // Use APC for autoloading to improve performance
     // Change 'sf2' by the prefix you want in order
     // to prevent key conflict with another application
-    $loader = new ApcClassLoader('sf2', $loader);
+    $loader = new ApcClassLoader('sf2', $classLoader);
     $loader->register(true);
 
     // ...

testing.rst

@@ -29,7 +29,7 @@ command:
 
     $ phpunit
 
-PHPunit is configured by the ``phpunit.xml.dist`` file in the root of your
+PHPUnit is configured by the ``phpunit.xml.dist`` file in the root of your
 Symfony application.
 
 .. tip::

validation/custom_constraint.rst

@@ -45,7 +45,7 @@ includes some simple default logic::
     // in the base Symfony\Component\Validator\Constraint class
     public function validatedBy()
     {
-        return get_class($this).'Validator';
+        return ContainsAlphanumericValidator::class;
     }
 
 In other words, if you create a custom ``Constraint`` (e.g. ``MyConstraint``),

workflow/usage.rst

@@ -241,7 +241,7 @@ order:
     * ``workflow.[workflow name].entered.[place name]``
 
 ``workflow.announce``
-    Triggered once for each workflow that now is available for the object.
+    Triggered for each place that now is available for the object.
 
     The three events being dispatched are: