Merge branch '2.1'

Author: weaverryan

book/forms.rst

@@ -439,7 +439,7 @@ You can also define whole logic inline by using a Closure::
             'validation_groups' => function(FormInterface $form) {
                 $data = $form->getData();
                 if (Entity\Client::TYPE_PERSON == $data->getType()) {
-                    return array('person')
+                    return array('person');
                 } else {
                     return array('company');
                 }

cookbook/console/console_command.rst

@@ -5,7 +5,7 @@ How to create a Console Command
 ===============================
 
 The Console page of the Components section (:doc:`/components/console/introduction`) covers
-how to create a Console command. This cookbook articles covers the differences
+how to create a Console command. This cookbook article covers the differences
 when creating Console commands within the Symfony2 framework.
 
 Automatically Registering Commands

cookbook/console/generating_urls.rst

@@ -0,0 +1,75 @@
+.. index::
+   single: Console; Generating URLs
+
+How to generate URLs with a custom Host in Console Commands
+===========================================================
+
+Unfortunately, the command line context does not know about your VirtualHost
+or domain name. This means that if if you generate absolute URLs within a
+Console Command you'll probably end up with something like ``http://localhost/foo/bar``
+which is not very useful.
+
+To fix this, you need to configure the "request context", which is a fancy
+way of saying that you need to configure your environment so that it knows
+what URL it should use when generating URLs.
+
+There are two ways of configuring the request context: at the application level
+and per Command.
+
+Configuring the Request Context globally
+----------------------------------------
+
+To configure the Request Context - which is used by the URL Generator - you can
+redefine the parameters it uses as default values to change the default host
+(localhost) and scheme (http). Note that this does not impact URLs generated
+via normal web requests, since those will override the defaults.
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/parameters.yml
+        parameters:
+            router.request_context.host: example.org
+            router.request_context.scheme: https
+
+    .. code-block:: xml
+
+        <?xml version="1.0" encoding="UTF-8"?>
+
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+            <parameters>
+                <parameter key="router.request_context.host">example.org</parameter>
+                <parameter key="router.request_context.scheme">https</parameter>
+            </parameters>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config_test.php
+        $container->setParameter('router.request_context.host', 'example.org');
+        $container->setParameter('router.request_context.scheme', 'https');
+
+Configuring the Request Context per Command
+-------------------------------------------
+
+To change it only in one command you can simply fetch the Request Context
+service and override its settings::
+
+    // src/Acme/DemoBundle/Command/DemoCommand.php
+    // ...
+
+    class DemoCommand extends ContainerAwareCommand
+    {
+        protected function execute(InputInterface $input, OutputInterface $output)
+        {
+            $context = $this->getContainer()->get('router')->getContext();
+            $context->setHost('example.com');
+            $context->setScheme('https');
+
+            // ... your code here
+        }
+    }
+

cookbook/console/index.rst

@@ -6,3 +6,4 @@ Console
 
     console_command
     usage
+    generating_urls

cookbook/doctrine/multiple_entity_managers.rst

@@ -1,14 +1,14 @@
 .. index::
    single: Doctrine; Multiple entity managers
 
-How to work with Multiple Entity Managers
-=========================================
+How to work with Multiple Entity Managers and Connections
+=========================================================
 
-You can use multiple entity managers in a Symfony2 application. This is
-necessary if you are using different databases or even vendors with entirely
-different sets of entities. In other words, one entity manager that connects
-to one database will handle some entities while another entity manager that
-connects to another database might handle the rest.
+You can use multiple Doctrine entity managers or connections in a Symfony2
+application. This is necessary if you are using different databases or even
+vendors with entirely different sets of entities. In other words, one entity
+manager that connects to one database will handle some entities while another
+entity manager that connects to another database might handle the rest.
 
 .. note::
 
@@ -23,6 +23,26 @@ The following configuration code shows how you can configure two entity managers
     .. code-block:: yaml
 
         doctrine:
+            dbal:
+                default_connection:   default
+                connections:
+                    default:
+                        driver:   %database_driver%
+                        host:     %database_host%
+                        port:     %database_port%
+                        dbname:   %database_name%
+                        user:     %database_user%
+                        password: %database_password%
+                        charset:  UTF8
+                    customer:
+                        driver:   %database_driver2%
+                        host:     %database_host2%
+                        port:     %database_port2%
+                        dbname:   %database_name2%
+                        user:     %database_user2%
+                        password: %database_password2%
+                        charset:  UTF8
+
             orm:
                 default_entity_manager:   default
                 entity_managers:
@@ -39,17 +59,34 @@ The following configuration code shows how you can configure two entity managers
 In this case, you've defined two entity managers and called them ``default``
 and ``customer``. The ``default`` entity manager manages entities in the
 ``AcmeDemoBundle`` and ``AcmeStoreBundle``, while the ``customer`` entity
-manager manages entities in the ``AcmeCustomerBundle``.
+manager manages entities in the ``AcmeCustomerBundle``. You've also defined
+two connections, one for each entity manager.
+
+.. note::
+
+    When working with multiple connections and entity managers, you should be 
+    explicit about which configuration you want. If you *do* omit the name of
+    the connection or entity manager, the default (i.e. ``default``) is used.
+
+When working with multiple connections to create your databases:
+
+.. code-block:: bash
+
+    # Play only with "default" connection
+    $ php app/console doctrine:database:create
+
+    # Play only with "customer" connection
+    $ php app/console doctrine:database:create --connection=customer
+
+When working with multiple entity managers to update your schema:
 
-When working with multiple entity managers, you should be explicit about which
-entity manager you want. If you *do* omit the entity manager's name when you
-update your schema, the default (i.e. ``default``) is used::
+.. code-block:: bash
 
     # Play only with "default" mappings
-    php app/console doctrine:schema:update --force
+    $ php app/console doctrine:schema:update --force
 
     # Play only with "customer" mappings
-    php app/console doctrine:schema:update --force --em=customer
+    $ php app/console doctrine:schema:update --force --em=customer
 
 If you *do* omit the entity manager's name when asking for it,
 the default entity manager (i.e. ``default``) is returned::

cookbook/map.rst.inc

@@ -28,6 +28,7 @@
 
   * :doc:`/cookbook/console/console_command`
   * :doc:`/cookbook/console/usage`
+  * :doc:`/cookbook/console/generating_urls`
 
 * :doc:`/cookbook/controller/index`