Merge remote-tracking branch 'upstream/2.7' into 2.7

Author: javiereguiluz

contributing/code/bugs.rst

@@ -26,9 +26,9 @@ If your problem definitely looks like a bug, report it using the official bug
 * Describe the steps needed to reproduce the bug with short code examples
   (providing a unit test that illustrates the bug is best);
 
-* If the bug you experienced affects more than one layer, providing a simple
-  failing unit test may not be sufficient. In this case, please fork the
-  `Symfony Standard Edition`_ and reproduce your issue on a new branch;
+* If the bug you experienced is not obvious or affects more than one layer, 
+  providing a simple failing unit test may not be sufficient. In this case, 
+  please :doc:`provide a reproducer </contributing/code/reproducer>`;
 
 * Give as much detail as possible about your environment (OS, PHP version,
   Symfony version, enabled extensions, ...);

doctrine.rst

@@ -632,7 +632,7 @@ Updating an Object
 Once you've fetched an object from Doctrine, updating it is easy. Suppose
 you have a route that maps a product id to an update action in a controller::
 
-    use AppBundle\Entity\Post;
+    use AppBundle\Entity\Product;
     // ...
 
     public function updateAction($productId)

reference/configuration/web_profiler.rst

@@ -4,6 +4,71 @@
 WebProfilerBundle Configuration ("web_profiler")
 ================================================
 
+The WebProfilerBundle provides detailed technical information about each request
+execution and displays it in both the web debug toolbar and the profiler.
+
+.. caution::
+
+    The web debug toolbar is not available for responses of type ``StreamedResponse``.
+
+Configuration
+-------------
+
+* `toolbar`_
+* `position`_
+* `intercept_redirects`_
+* `excluded_ajax_paths`_
+* `verbose`_
+
+toolbar
+~~~~~~~
+
+**type**: ``boolean`` **default**: ``true``
+
+It enables and disables the toolbar entirely. Usually you set this to ``true``
+in the ``dev`` and ``test`` environments and to ``false`` in the ``prod``
+environment.
+
+position
+~~~~~~~~
+
+**type**: ``string`` **default**: ``bottom``
+
+It defines the location of the browser window where the toolbar is displayed.
+the only allowed values are ``bottom`` and ``top``.
+
+intercept_redirects
+~~~~~~~~~~~~~~~~~~~
+
+**type**: ``boolean`` **default**: ``false``
+
+If a redirect occurs during an HTTP response, the browser follows it automatically
+and you won't see the toolbar or the profiler of the original URL, only the
+redirected URL.
+
+When setting this option to ``true``, the browser *stops* before making any
+redirection and shows you the URL which is going to redirect to, its toolbar,
+and its profiler. Once you've inspected the toolbar/profiler data, you can click
+on the given link to perform the redirect.
+
+excluded_ajax_paths
+~~~~~~~~~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``'^/(app(_[\\w]+)?\\.php/)?_wdt'``
+
+When the toolbar logs Ajax requests, it matches their URLs against this regular
+expression. If the URL matches, the request is not displayed in the toolbar. This
+is useful when the application makes lots of Ajax requests or they are heavy and
+you want to exclude some of them.
+
+verbose
+~~~~~~~
+
+**type**: ``boolean`` **default**: ``true``
+
+This option is **deprecated** and has no effect on the toolbar or the profiler,
+so you can safely remove it from your configuration.
+
 Full Default Configuration
 --------------------------
 
@@ -13,23 +78,14 @@ Full Default Configuration
 
         # app/config/config.yml
         web_profiler:
-
-            # DEPRECATED, it is not useful anymore and can be removed
-            # safely from your configuration
-            verbose:              true
-
-            # display the web debug toolbar at the bottom of pages with
-            # a summary of profiler info
             toolbar:              false
             position:             bottom
-
-            # gives you the opportunity to look at the collected data
-            # before following the redirect
-            intercept_redirects: false
-
-            # Exclude AJAX requests in the web debug toolbar for specified paths
+            intercept_redirects:  false
             excluded_ajax_paths:  ^/bundles|^/_wdt
 
+            # DEPRECATED, it can be removed safely from your configuration
+            verbose:              true
+
     .. code-block:: xml
 
         <!-- app/config/config.xml -->

service_container.rst

@@ -15,7 +15,7 @@ a very special object called the **service container**. If you have the service
 then you can fetch a service by using that service's id::
 
     $logger = $container->get('logger');
-    $entityManager = $container->get('doctrine.entity_manager');
+    $entityManager = $container->get('doctrine.orm.entity_manager');
 
 The container is the *heart* of Symfony: it allows you to standardize and centralize
 the way objects are constructed. It makes your life easier, is super fast, and emphasizes

service_container/parent_services.rst

@@ -7,7 +7,7 @@ How to Manage Common Dependencies with Parent Services
 As you add more functionality to your application, you may well start to
 have related classes that share some of the same dependencies. For example,
 you may have multiple repository classes which need the
-``doctrine.entity_manager`` service and an optional ``logger`` service::
+``doctrine.orm.entity_manager`` service and an optional ``logger`` service::
 
     // src/AppBundle/Repository/BaseDoctrineRepository.php
     namespace AppBundle\Repository;
@@ -67,7 +67,7 @@ duplicated service definitions:
             app.base_doctrine_repository:
                 # as no class is configured, the parent service MUST be abstract
                 abstract:  true
-                arguments: ['@doctrine.entity_manager']
+                arguments: ['@doctrine.orm.entity_manager']
                 calls:
                     - [setLogger, ['@logger']]
 
@@ -93,7 +93,7 @@ duplicated service definitions:
             <services>
                 <!-- as no class is configured, the parent service MUST be abstract -->
                 <service id="app.base_doctrine_repository" abstract="true">
-                    <argument type="service" id="doctrine.entity_manager" />
+                    <argument type="service" id="doctrine.orm.entity_manager" />
 
                     <call method="setLogger">
                         <argument type="service" id="logger" />
@@ -124,7 +124,7 @@ duplicated service definitions:
 
         // as no class is configured, the parent service MUST be abstract
         $container->register('app.base_doctrine_repository')
-            ->addArgument(new Reference('doctrine.entity_manager'))
+            ->addArgument(new Reference('doctrine.orm.entity_manager'))
             ->addMethodCall('setLogger', array(new Reference('logger')))
         ;