Merge branch '2.3' into 2.6

Author: wouterj

book/doctrine.rst

@@ -1204,8 +1204,7 @@ to the given ``Category`` object via their ``category_id`` value.
         $category = $product->getCategory();
 
         // prints "Proxies\AppBundleEntityCategoryProxy"
-        dump(get_class($category));
-        die();
+        var_dump(get_class($category));
 
     This proxy object extends the true ``Category`` object, and looks and
     acts exactly like it. The difference is that, by using a proxy object,

book/translation.rst

@@ -12,13 +12,11 @@ wrapping each with a function capable of translating the text (or "message")
 into the language of the user::
 
     // text will *always* print out in English
-    dump('Hello World');
-    die();
+    var_dump('Hello World');
 
     // text can be translated into the end-user's language or
     // default to English
-    dump($translator->trans('Hello World'));
-    die();
+    var_dump($translator->trans('Hello World'));
 
 .. note::
 

components/console/introduction.rst

@@ -200,7 +200,7 @@ level of verbosity.
 It is possible to print a message in a command for only a specific verbosity
 level. For example::
 
-    if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+    if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
         $output->writeln(...);
     }
 

cookbook/bundles/remove.rst

@@ -79,8 +79,7 @@ can remove the ``Acme`` directory as well.
     :method:`Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface::getPath` method
     to get the path of the bundle::
 
-        dump($this->container->get('kernel')->getBundle('AcmeDemoBundle')->getPath());
-        die();
+        var_dump($this->container->get('kernel')->getBundle('AcmeDemoBundle')->getPath());
 
 3.1 Remove Bundle Assets
 ~~~~~~~~~~~~~~~~~~~~~~~~