Merge branch '2.8' into 3.3

javiereguiluz · javiereguiluz · commit 0387f3b55504 · 2018-01-13T16:42:07.000+01:00
* 2.8: Fixed a typo in templating/debug.rst Mention the SensioGeneratorBundle in the bundles article Use stricter syntax when testing Fix default value of strict_variables minor #9042 add missing twig dump construct (hellomedia, javiereguiluz)
diff --git a/bundles.rst b/bundles.rst
@@ -64,17 +64,14 @@ are used by your application (including the core Symfony bundles).
 Creating a Bundle
 -----------------
 
-The Symfony Standard Edition comes with a handy task that creates a fully-functional
-bundle for you. Of course, creating a bundle by hand is pretty easy as well.
+`SensioGeneratorBundle`_ is an optional bundle that includes commands to create
+different elements of your application, such as bundles. If you create lots of
+bundles, consider using it. However, this section creates and enables a new
+bundle by hand to show how simple is to do it.
 
-To show you how simple the bundle system is, create a new bundle called
-AcmeTestBundle and enable it.
-
-.. tip::
-
-    The ``Acme`` portion is just a dummy name that should be replaced by
-    some "vendor" name that represents you or your organization (e.g.
-    ABCTestBundle for some company named ``ABC``).
+The new bundle is called AcmeTestBundle, where the ``Acme`` portion is just a
+dummy name that should be replaced by some "vendor" name that represents you or
+your organization (e.g. ABCTestBundle for some company named ``ABC``).
 
 Start by creating a ``src/Acme/TestBundle/`` directory and adding a new file
 called ``AcmeTestBundle.php``::
@@ -182,3 +179,4 @@ Learn more
     bundles/*
 
 .. _`third-party bundles`: https://github.com/search?q=topic%3Asymfony-bundle&type=Repositories
+.. _`SensioGeneratorBundle`: https://github.com/sensiolabs/SensioGeneratorBundle
diff --git a/email/testing.rst b/email/testing.rst
@@ -47,17 +47,17 @@ to get information about the messages sent on the previous request::
             $mailCollector = $client->getProfile()->getCollector('swiftmailer');
 
             // Check that an email was sent
-            $this->assertEquals(1, $mailCollector->getMessageCount());
+            $this->assertSame(1, $mailCollector->getMessageCount());
 
             $collectedMessages = $mailCollector->getMessages();
             $message = $collectedMessages[0];
 
             // Asserting email data
             $this->assertInstanceOf('Swift_Message', $message);
-            $this->assertEquals('Hello Email', $message->getSubject());
-            $this->assertEquals('send@example.com', key($message->getFrom()));
-            $this->assertEquals('recipient@example.com', key($message->getTo()));
-            $this->assertEquals(
+            $this->assertSame('Hello Email', $message->getSubject());
+            $this->assertSame('send@example.com', key($message->getFrom()));
+            $this->assertSame('recipient@example.com', key($message->getTo()));
+            $this->assertSame(
                 'You should see me from the profiler!',
                 $message->getBody()
             );
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -440,7 +440,7 @@ by Symfony. Besides, it simplifies how you refer to those templates:
 strict_variables
 ~~~~~~~~~~~~~~~~
 
-**type**: ``boolean`` **default**: ``'%kernel.debug%'``
+**type**: ``boolean`` **default**: ``false``
 
 If set to ``true``, Symfony shows an exception whenever a Twig variable,
 attribute or method doesn't exist. If set to ``false`` these errors are ignored
diff --git a/templating/debug.rst b/templating/debug.rst
@@ -49,7 +49,7 @@ In a Twig template, you can use the ``dump`` utility as a function or a tag:
     {% dump articles %}
 
     {% for article in articles %}
-        {# the contents of this variable are display on the web page #}
+        {# the contents of this variable are displayed on the web page #}
         {{ dump(article) }}
 
         <a href="/article/{{ article.slug }}">
