Merge branch '2.1' into 2.2

Conflicts:
	components/console/helpers/dialoghelper.rst

Author: weaverryan

book/installation.rst

@@ -75,7 +75,7 @@ you should have a directory that looks something like this:
 
 .. code-block:: text
 
-    path/to/webroot/ <- your web root directory
+    path/to/webroot/ <- your web server directory (sometimes named htdocs or public)
         Symfony/ <- the new directory
             app/
                 cache/
@@ -123,6 +123,22 @@ next section.
     :doc:`/cookbook/configuration/override_dir_structure` for more
     information.
 
+All public files and the front controller that handles incoming requests in
+a Symfony2 application live in the ``Symfony/web/`` directory. So, assuming
+you unpacked the archive into your web server's or virtual host's document root,
+your application's URLs will start with ``http://localhost/Symfony/web/``.
+To get nice and short URLs you should point the document root of your web
+server or virtual host to the ``Symfony/web/`` directory. Though this is not
+required for development it is recommended when your application goes into
+production as all system and configuration files become inaccessible to clients.
+For information on configuring your specific web server document root, see
+the following documentation: `Apache`_ | `Nginx`_ .
+
+.. note::
+
+    The following examples assume you don't touch the document root settings
+    so all URLs start with ``http://localhost/Symfony/web/``
+
 .. _installation-updating-vendors:
 
 Updating Vendors

book/internals.rst

@@ -44,6 +44,10 @@ variables:
   :class:`Symfony\\Component\\HttpFoundation\\SessionStorage\\SessionStorageInterface`
   interface abstract session management ``session_*()`` functions.
 
+.. note::
+
+    Read more about the :doc:`HttpFoundation Component </components/http_foudation/introduction>`.
+
 ``HttpKernel`` Component
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -58,7 +62,8 @@ Dependency Injection component and a powerful plugin system (bundles).
 
 .. seealso::
 
-    Read more about :doc:`Dependency Injection </book/service_container>` and
+    Read more about the :doc:`HttpKernel Component </components/http_kernel/introduction>`,
+    :doc:`Dependency Injection </book/service_container>` and
     :doc:`Bundles </cookbook/bundles/best_practices>`.
 
 ``FrameworkBundle`` Bundle
@@ -256,6 +261,10 @@ uses a :class:`Symfony\\Component\\Routing\\RouterInterface` object to match
 the ``Request`` and determine the Controller name (stored in the
 ``_controller`` ``Request`` attribute).
 
+.. seealso::
+
+    Read more on the :ref:`kernel.request event <component-http-kernel-kernel-request>`.
+
 .. index::
    single: Event; kernel.controller
 
@@ -278,6 +287,10 @@ to modify the controller that should be executed::
         $event->setController($controller);
     }
 
+.. seealso::
+
+    Read more on the :ref:`kernel.controller event <component-http-kernel-kernel-controller>`.
+
 .. index::
    single: Event; kernel.view
 
@@ -307,6 +320,10 @@ The value returned by the Controller is accessible via the
         $event->setResponse($response);
     }
 
+.. seealso::
+
+    Read more on the :ref:`kernel.view event <component-http-kernel-kernel-view>`.
+
 .. index::
    single: Event; kernel.response
 
@@ -340,6 +357,26 @@ The ``FrameworkBundle`` registers several listeners:
   ``Surrogate-Control`` HTTP header when the Response needs to be parsed for
   ESI tags.
 
+.. seealso::
+
+    Read more on the :ref:`kernel.response event <component-http-kernel-kernel-response>`.
+
+.. index::
+   single: Event; kernel.terminate
+
+``kernel.terminate`` Event
+..........................
+
+.. versionadded:: 2.1
+    The ``kernel.terminate`` event is new since Symfony 2.1.
+
+The purpose of this event is to perform "heavier" tasks after the response
+was already served to the client.
+
+.. seealso::
+
+    Read more on the :ref:`kernel.terminate event <component-http-kernel-kernel-terminate>`.
+
 .. index::
    single: Event; kernel.exception
 
@@ -393,6 +430,10 @@ The event dispatcher is a standalone component that is responsible for much
 of the underlying logic and flow behind a Symfony request. For more information,
 see the :doc:`Event Dispatcher Component Documentation</components/event_dispatcher/introduction>`.
 
+.. seealso::
+
+    Read more on the :ref:`kernel.exception event <component-http-kernel-kernel-exception>`.
+
 .. index::
    single: Profiler
 

components/console/helpers/dialoghelper.rst

@@ -188,3 +188,42 @@ is asked to provide the answer another time, until she enters a valid string
 or the maximum attempts is reached (which you can define in the fifth
 parameter). The default value for the attempts is ``false``, which means infinite
 attempts. You can define your own error message in the sixth parameter.
+
+Testing a Command which expects input
+-------------------------------------
+
+If you want to write a unit test for a command which expects some kind of input
+from the command line, you need to overwrite the HelperSet used by the command::
+
+    use Symfony\Component\Console\Helper\DialogHelper;
+    use Symfony\Component\Console\Helper\HelperSet;
+    
+    // ...
+    public function testExecute()
+    {
+        // ...
+        $commandTester = new CommandTester($command);
+        
+        $dialog = $command->getHelper('dialog');
+        $dialog->setInputStream($this->getInputStream('Test\n')); 
+        // Equals to a user inputing "Test" and hitting ENTER
+        // If you need to enter a confirmation, "yes\n" will work
+        
+        $commandTester->execute(array('command' => $command->getName()));
+    
+        // $this->assertRegExp('/.../', $commandTester->getDisplay());
+    }
+    
+    protected function getInputStream($input)
+    {
+        $stream = fopen('php://memory', 'r+', false);
+        fputs($stream, $input);
+        rewind($stream);
+
+        return $stream;
+    }
+    
+By setting the inputStream of the ``DialogHelper``, you imitate what the
+console would do internally with all user input through the cli. This way
+you can test any user interaction (even complex ones) by passing an appropriate
+input stream.

components/http_kernel/introduction.rst

@@ -259,6 +259,8 @@ will be called after another event - ``kernel.controller`` - is dispatched.
     There are also a few other variations on the above process (e.g. if
     you're registering your controllers as services).
 
+.. _component-http-kernel-kernel-controller:
+
 3) The ``kernel.controller`` event
 ----------------------------------
 
@@ -444,6 +446,8 @@ method, which sends the headers and prints the ``Response`` content.
     serializes the current user's information into the
     session so that it can be reloaded on the next request. 
 
+.. _component-http-kernel-kernel-terminate:
+
 8) The ``kernel.terminate`` event
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

reference/forms/types/repeated.rst

@@ -24,7 +24,6 @@ accuracy.
 +-------------+------------------------------------------------------------------------+
 | Inherited   | - `invalid_message`_                                                   |
 | options     | - `invalid_message_parameters`_                                        |
-|             | - `error_bubbling`_                                                    |
 +-------------+------------------------------------------------------------------------+
 | Parent type | :doc:`field</reference/forms/types/form>`                              |
 +-------------+------------------------------------------------------------------------+
@@ -187,5 +186,3 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
-
-.. include:: /reference/forms/types/options/error_bubbling.rst.inc