Merge branch '2.3' into 2.7

Conflicts:
	reference/forms/types/entity.rst

Author: wouterj

components/console/introduction.rst

@@ -143,7 +143,7 @@ Coloring the Output
     By default, the Windows command console doesn't support output coloring. The
     Console component disables output coloring for Windows systems, but if your
     commands invoke other scripts which emit color sequences, they will be
-    wrongly displayed as raw escape characters. Install the `ConEmu`_, `ANSICON`_
+    wrongly displayed as raw escape characters. Install the `Cmder`_, `ConEmu`_, `ANSICON`_
     or `Mintty`_ (used by default in GitBash and Cygwin) free applications
     to add coloring support to your Windows command console.
 
@@ -581,6 +581,7 @@ Learn More!
 * :doc:`/components/console/console_arguments`
 
 .. _Packagist: https://packagist.org/packages/symfony/console
+.. _Cmder: http://cmder.net/
 .. _ConEmu: https://conemu.github.io/
 .. _ANSICON: https://github.com/adoxa/ansicon/releases
 .. _Mintty: https://mintty.github.io/

components/dependency_injection/lazy_services.rst

@@ -100,9 +100,9 @@ your lazy loaded services are working.
 
 .. note::
 
-    If you don't install the `ProxyManager bridge`_, the container will
-    just skip over the ``lazy`` flag and simply instantiate the service
-    as it would normally do.
+    If you don't install the `ProxyManager bridge`_ and the
+    `ocramius/proxy-manager`_, the container will just skip over the ``lazy``
+    flag and simply instantiate the service as it would normally do.
 
 The proxy gets initialized and the actual service is instantiated as soon
 as you interact in any way with this object.
@@ -117,3 +117,4 @@ in the `documentation of ProxyManager`_.
 .. _`ProxyManager bridge`: https://github.com/symfony/symfony/tree/master/src/Symfony/Bridge/ProxyManager
 .. _`proxy`: https://en.wikipedia.org/wiki/Proxy_pattern
 .. _`documentation of ProxyManager`: https://github.com/Ocramius/ProxyManager/blob/master/docs/lazy-loading-value-holder.md
+.. _`ocramius/proxy-manager`: https://github.com/Ocramius/ProxyManager

contributing/code/tests.rst

@@ -51,9 +51,10 @@ what's going on and if the tests are broken because of the new code.
 
 .. tip::
 
-    On Windows, install the `ConEmu`_, `ANSICON`_ or `Mintty`_ free applications
+    On Windows, install the `Cmder`_, `ConEmu`_, `ANSICON`_ or `Mintty`_ free applications
     to see colored test results.
 
+.. _Cmder: http://cmder.net/
 .. _ConEmu: https://code.google.com/p/conemu-maximus5/
 .. _ANSICON: https://github.com/adoxa/ansicon/releases
 .. _Mintty: https://mintty.github.io/

cookbook/bundles/extension.rst

@@ -125,3 +125,39 @@ Using Configuration to Change the Services
 The Extension is also the class that handles the configuration for that
 particular bundle (e.g. the configuration in ``app/config/config.yml``). To
 read more about it, see the ":doc:`/cookbook/bundles/configuration`" article.
+
+Adding Classes to Compile
+-------------------------
+
+Symfony creates a big ``classes.php`` file in the cache directory to aggregate
+the contents of the PHP classes that are used in every request. This reduces the
+I/O operations and increases the application performance.
+
+Your bundles can also add their own classes into this file thanks to the
+``addClassesToCompile()`` method. Define the classes to compile as an array of
+their fully qualified class names::
+
+    // ...
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        // ...
+
+         $this->addClassesToCompile(array(
+            'AppBundle\\Manager\\UserManager',
+            'AppBundle\\Utils\\Slugger',
+            // ...
+        ));
+    }
+
+.. note::
+
+    If some class extends from other classes, all its parents are automatically
+    included in the list of classes to compile.
+
+Beware that this technique **can't be used in some cases**:
+
+* When classes contain annotations, such as controllers with ``@Route``
+  annotations and entities with ``@ORM`` or ``@Assert`` annotations, because
+  the file location retrieved from PHP reflection changes;
+* When classes use the ``__DIR__`` and ``__FILE__`` constants, because their
+  values will change when loading these classes from the ``classes.php`` file.

cookbook/console/logging.rst

@@ -84,7 +84,7 @@ First configure a listener for console exception events in the service container
 
         # app/config/services.yml
         services:
-            kernel.listener.command_dispatch:
+            app.listener.command_exception:
                 class: AppBundle\EventListener\ConsoleExceptionListener
                 arguments: ['@logger']
                 tags:
@@ -99,7 +99,7 @@ First configure a listener for console exception events in the service container
                    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="kernel.listener.command_dispatch" class="AppBundle\EventListener\ConsoleExceptionListener">
+                <service id="app.listener.command_exception" class="AppBundle\EventListener\ConsoleExceptionListener">
                     <argument type="service" id="logger"/>
                     <tag name="kernel.event_listener" event="console.exception" />
                 </service>
@@ -121,7 +121,7 @@ First configure a listener for console exception events in the service container
             array('event' => 'console.exception')
         );
         $container->setDefinition(
-            'kernel.listener.command_dispatch',
+            'app.listener.command_exception',
             $definitionConsoleExceptionListener
         );
 
@@ -181,7 +181,7 @@ First configure a listener for console terminate events in the service container
 
         # app/config/services.yml
         services:
-            kernel.listener.command_dispatch:
+            app.listener.command_error:
                 class: AppBundle\EventListener\ErrorLoggerListener
                 arguments: ['@logger']
                 tags:
@@ -196,7 +196,7 @@ First configure a listener for console terminate events in the service container
                    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
             <services>
-                <service id="kernel.listener.command_dispatch" class="AppBundle\EventListener\ErrorLoggerListener">
+                <service id="app.listener.command_error" class="AppBundle\EventListener\ErrorLoggerListener">
                     <argument type="service" id="logger"/>
                     <tag name="kernel.event_listener" event="console.terminate" />
                 </service>
@@ -218,7 +218,7 @@ First configure a listener for console terminate events in the service container
             array('event' => 'console.terminate')
         );
         $container->setDefinition(
-            'kernel.listener.command_dispatch',
+            'app.listener.command_error',
             $definitionErrorLoggerListener
         );
 

cookbook/frontend/bower.rst

@@ -25,8 +25,8 @@ it's installed correctly.
 .. tip::
 
     If you don't want to have NodeJS on your computer, you can also use
-    BowerPHP_ (an unofficial PHP port of Bower). Beware that this is still in
-    an alpha state. If you're using BowerPHP, use ``bowerphp`` instead of
+    BowerPHP_ (an unofficial PHP port of Bower). Beware that this is currently
+    in beta status. If you're using BowerPHP, use ``bowerphp`` instead of
     ``bower`` in the examples.
 
 Configuring Bower in your Project

cookbook/profiler/profiling_data.rst

@@ -34,17 +34,17 @@ The ``profiler`` service also provides the
 look for tokens based on some criteria::
 
     // get the latest 10 tokens
-    $tokens = $container->get('profiler')->find('', '', 10, '', '');
+    $tokens = $container->get('profiler')->find('', '', 10, '', '', '');
 
     // get the latest 10 tokens for all URL containing /admin/
-    $tokens = $container->get('profiler')->find('', '/admin/', 10, '', '');
+    $tokens = $container->get('profiler')->find('', '/admin/', 10, '', '', '');
 
-    // get the latest 10 tokens for local requests
-    $tokens = $container->get('profiler')->find('127.0.0.1', '', 10, '', '');
+    // get the latest 10 tokens for local POST requests
+    $tokens = $container->get('profiler')->find('127.0.0.1', '', 10, 'POST', '', '');
 
     // get the latest 10 tokens for requests that happened between 2 and 4 days ago
     $tokens = $container->get('profiler')
-        ->find('', '', 10, '4 days ago', '2 days ago');
+        ->find('', '', 10, '', '4 days ago', '2 days ago');
 
 Lastly, if you want to manipulate profiling data on a different machine than the
 one where the information was generated, use the ``profiler:export`` and

cookbook/testing/doctrine.rst

@@ -60,6 +60,8 @@ which makes all of this quite easy::
         protected function tearDown()
         {
             parent::tearDown();
+
             $this->em->close();
+            $this->em = null; // avoid memory leaks
         }
     }

reference/forms/types/entity.rst

@@ -59,47 +59,56 @@ The ``entity`` type has just one required option: the entity which should
 be listed inside the choice field::
 
     $builder->add('users', 'entity', array(
-        'class' => 'AcmeHelloBundle:User',
+        // query choices from this entity
+        'class' => 'AppBundle:User',
+
+        // use the User.username property as the visible option string
         'choice_label' => 'username',
+
+        // used to render a select box, check boxes or radios
+        // 'multiple' => true,
+        // 'expanded' => true,
     ));
 
-In this case, all ``User`` objects will be loaded from the database and
-rendered as either a ``select`` tag, a set or radio buttons or a series
-of checkboxes (this depends on the ``multiple`` and ``expanded`` values).
-If the entity object does not have a ``__toString()`` method the ``choice_label``
-option is needed.
+This will build a ``select`` drop-down containing *all* of the ``User`` objects
+in the database. To render radio buttons or checkboxes instead, change the
+`multiple`_ and `expanded`_ options.
+
+.. _ref-form-entity-query-builder:
 
 Using a Custom Query for the Entities
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you need to specify a custom query to use when fetching the entities
+If you want to create a custom query to use when fetching the entities
 (e.g. you only want to return some entities, or need to order them), use
-the ``query_builder`` option. The easiest way to use the option is as follows::
+the `query_builder`_ option::
 
     use Doctrine\ORM\EntityRepository;
     // ...
 
     $builder->add('users', 'entity', array(
-        'class' => 'AcmeHelloBundle:User',
+        'class' => 'AppBundle:User',
         'query_builder' => function (EntityRepository $er) {
             return $er->createQueryBuilder('u')
                 ->orderBy('u.username', 'ASC');
         },
+        'choice_label' => 'username',
     ));
 
 .. _reference-forms-entity-choices:
 
 Using Choices
 ~~~~~~~~~~~~~
 
-If you already have the exact collection of entities that you want included
-in the choice element, you can simply pass them via the ``choices`` key.
+If you already have the exact collection of entities that you want to include
+in the choice element, just pass them via the ``choices`` key.
+
 For example, if you have a ``$group`` variable (passed into your form perhaps
 as a form option) and ``getUsers`` returns a collection of ``User`` entities,
 then you can supply the ``choices`` option directly::
 
     $builder->add('users', 'entity', array(
-        'class' => 'AcmeHelloBundle:User',
+        'class' => 'AppBundle:User',
         'choices' => $group->getUsers(),
     ));
 
@@ -157,8 +166,8 @@ class
 
 **type**: ``string`` **required**
 
-The class of your entity (e.g. ``AcmeStoreBundle:Category``). This can be
-a fully-qualified class name (e.g. ``Acme\StoreBundle\Entity\Category``)
+The class of your entity (e.g. ``AppBundle:Category``). This can be
+a fully-qualified class name (e.g. ``AppBundle\Entity\Category``)
 or the short alias name (as shown prior).
 
 em
@@ -174,11 +183,12 @@ query_builder
 
 **type**: ``Doctrine\ORM\QueryBuilder`` or a Closure
 
-If specified, this is used to query the subset of options (and their
-order) that should be used for the field. The value of this option can
-either be a ``QueryBuilder`` object or a Closure. If using a Closure,
-it should take a single argument, which is the ``EntityRepository`` of
-the entity and return an instance of ``QueryBuilder``.
+Allows you to create a custom query for your choices. See
+:ref:`ref-form-entity-query-builder` for an example.
+
+The value of this option can either be a ``QueryBuilder`` object or a Closure.
+When using a Closure, you will be passed the ``EntityRepository`` of the entity
+as the only argument and should return a ``QueryBuilder``.
 
 Overridden Options
 ------------------