Fixes and improvements

Author: javiereguiluz

session/database.rst

@@ -19,29 +19,62 @@ installed and configured the `phpredis extension`_.
 
 First, define a Symfony service for the connection to the Redis server:
 
-.. code-block:: yaml
-
-    # config/services.yaml
-    services:
-        # ...
-        Redis:
-            class: Redis
-            calls:
-                - method: connect
-                  arguments:
-                      - '%env(REDIS_HOST)%'
-                      - '%env(int:REDIS_PORT)%'
-
-                # uncomment the following if your Redis server requires a password
-                # - method: auth
-                #   arguments:
-                #       - '%env(REDIS_PASSWORD)%'
-
-                # uncomment the following if your Redis server defines a key prefix
-                # - method: setOption
-                #   arguments:
-                #       - !php/const Redis::OPT_PREFIX
-                #       - 'my_prefix'
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # config/services.yaml
+        services:
+            # ...
+            Redis:
+                # you can also use \RedisArray, \RedisCluster or \Predis\Client classes
+                class: Redis
+                calls:
+                    - method: connect
+                      arguments:
+                          - '%env(REDIS_HOST)%'
+                          - '%env(int:REDIS_PORT)%'
+
+                    # uncomment the following if your Redis server requires a password
+                    # - method: auth
+                    #   arguments:
+                    #       - '%env(REDIS_PASSWORD)%'
+
+    .. 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"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <services>
+                <!-- you can also use \RedisArray, \RedisCluster or \Predis\Client classes -->
+                <service id="Redis" class="Redis">
+                    <call method="connect">
+                        <argument>%env(REDIS_HOST)%</argument>
+                        <argument>%env(int:REDIS_PORT)%</argument>
+                    </call>
+
+                    <!-- uncomment the following if your Redis server requires a password:
+                    <call method="auth">
+                        <argument>%env(REDIS_PASSWORD)%</argument>
+                    </call> -->
+                </service>
+            </services>
+        </container>
+
+    .. code-block:: php
+
+        use Symfony\Component\DependencyInjection\Reference;
+
+        // ...
+        $container
+            // you can also use \RedisArray, \RedisCluster or \Predis\Client classes
+            ->register('Redis', \Redis::class)
+            ->addMethodCall('connect', ['%env(REDIS_HOST)%', '%env(int:REDIS_PORT)%'])
+            // uncomment the following if your Redis server requires a password:
+            // ->addMethodCall('auth', ['%env(REDIS_PASSWORD)%'])
+        ;
 
 Now pass this Redis connection as an argument of the service associated to the
 :class:`Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler`:
@@ -56,13 +89,21 @@ Now pass this Redis connection as an argument of the service associated to the
             Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler:
                 arguments:
                     - '@Redis'
+                    # you can optionally pass an array of options. The only option is 'prefix',
+                    # which defines the prefix to use for the keys to avoid collision on the Redis server
+                    # - { prefix: 'my_prefix' }
 
     .. code-block:: xml
 
         <!-- config/services.xml -->
         <services>
             <service id="Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler">
                 <argument type="service" id="Redis"/>
+                <!-- you can optionally pass an array of options. The only option is 'prefix',
+                     which defines the prefix to use for the keys to avoid collision on the Redis server:
+                <argument type="collection">
+                    <argument key="prefix">my_prefix</argument>
+                </argument> -->
             </service>
         </services>
 
@@ -73,7 +114,12 @@ Now pass this Redis connection as an argument of the service associated to the
 
         $container
             ->register(RedisSessionHandler::class)
-            ->addArgument(new Reference('Redis'));
+            ->addArgument(
+                new Reference('Redis'),
+                // you can optionally pass an array of options. The only option is 'prefix',
+                // which defines the prefix to use for the keys to avoid collision on the Redis server:
+                // ['prefix' => 'my_prefix'],
+            );
 
 Next, use the :ref:`handler_id <config-framework-session-handler-id>`
 configuration option to tell Symfony to use this service as the session handler:
@@ -425,7 +471,7 @@ the MongoDB connection as argument:
 
         $storageDefinition = $container->autowire(MongoDbSessionHandler::class)
             ->setArguments([
-                '...',
+                new Reference('doctrine_mongodb.odm.default_connection'),
             ])
         ;
 
@@ -464,6 +510,13 @@ configuration option to tell Symfony to use this service as the session handler:
             ],
         ]);
 
+.. note::
+
+    MongoDB ODM 1.x only works with the legacy driver, which is no longer
+    supported by the Symfony session class. Install the ``alcaeus/mongo-php-adapter``
+    package to retrieve the underlying ``\MongoDB\Client`` object or upgrade to
+    MongoDB ODM 2.0.
+
 That's all! Symfony will now use your MongoDB server to read and write the
 session data. You do not need to do anything to initialize your session
 collection. However, you may want to add an index to improve garbage collection