Merge branch '2.8' into 3.2

xabbuh · xabbuh · commit 47db19d1fcbb · 2017-07-04T22:36:29.000+02:00
* 2.8:
  Update custom_constraint.rst
  Add form_theme in error customization
  Wrap the instantiation in parenthesis, and chain away
  fix variable being overwritten
diff --git a/email.rst b/email.rst
@@ -103,7 +103,7 @@ an email is pretty straightforward::
 
     public function indexAction($name)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(
@@ -125,6 +125,7 @@ an email is pretty straightforward::
             )
             */
         ;
+
         $this->get('mailer')->send($message);
 
         return $this->render(...);
diff --git a/email/dev_environment.rst b/email/dev_environment.rst
@@ -100,7 +100,7 @@ Now, suppose you're sending an email to ``recipient@example.com``.
 
     public function indexAction($name)
     {
-        $message = new \Swift_Message('Hello Email')
+        $message = (new \Swift_Message('Hello Email'))
             ->setFrom('send@example.com')
             ->setTo('recipient@example.com')
             ->setBody(
@@ -110,6 +110,7 @@ Now, suppose you're sending an email to ``recipient@example.com``.
                 )
             )
         ;
+
         $this->get('mailer')->send($message);
 
         return $this->render(...);
diff --git a/email/testing.rst b/email/testing.rst
@@ -14,7 +14,7 @@ Start with an easy controller action that sends an email::
 
     public function sendEmailAction($name)
     {
-        $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!')
diff --git a/form/form_customization.rst b/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 %}
diff --git a/performance.rst b/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);
 
     // ...
diff --git a/validation/custom_constraint.rst b/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``),

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ an email is pretty straightforward::`
`103`	`103`
`104`	`104`	`public function indexAction($name)`
`105`	`105`	`{`
`106`		`- $message = new \Swift_Message('Hello Email')`
	`106`	`+ $message = (new \Swift_Message('Hello Email'))`
`107`	`107`	`->setFrom('send@example.com')`
`108`	`108`	`->setTo('recipient@example.com')`
`109`	`109`	`->setBody(`
`@@ -125,6 +125,7 @@ an email is pretty straightforward::`
`125`	`125`	`)`
`126`	`126`	`*/`
`127`	`127`	`;`
	`128`	`+`
`128`	`129`	`$this->get('mailer')->send($message);`
`129`	`130`
`130`	`131`	`return $this->render(...);`
Original file line number	Diff line number	Diff line change
@@ -100,7 +100,7 @@ Now, suppose you're sending an email to ``recipient@example.com``.
`100`	`100`
`101`	`101`	`public function indexAction($name)`
`102`	`102`	`{`
`103`		`- $message = new \Swift_Message('Hello Email')`
	`103`	`+ $message = (new \Swift_Message('Hello Email'))`
`104`	`104`	`->setFrom('send@example.com')`
`105`	`105`	`->setTo('recipient@example.com')`
`106`	`106`	`->setBody(`
@@ -110,6 +110,7 @@ Now, suppose you're sending an email to ``recipient@example.com``.
`110`	`110`	`)`
`111`	`111`	`)`
`112`	`112`	`;`
	`113`	`+`
`113`	`114`	`$this->get('mailer')->send($message);`
`114`	`115`
`115`	`116`	`return $this->render(...);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Start with an easy controller action that sends an email::`
`14`	`14`
`15`	`15`	`public function sendEmailAction($name)`
`16`	`16`	`{`
`17`		`- $message = new \Swift_Message('Hello Email')`
	`17`	`+ $message = (new \Swift_Message('Hello Email'))`
`18`	`18`	`->setFrom('send@example.com')`
`19`	`19`	`->setTo('recipient@example.com')`
`20`	`20`	`->setBody('You should see me from the profiler!')`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ includes some simple default logic::`
`45`	`45`	`// in the base Symfony\Component\Validator\Constraint class`
`46`	`46`	`public function validatedBy()`
`47`	`47`	`{`
`48`		`- return get_class($this).'Validator';`
	`48`	`+ return ContainsAlphanumericValidator::class;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	In other words, if you create a custom ``Constraint`` (e.g. ``MyConstraint``),