From 93d81a171c464655d0c03387d498d4b610e24a86 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sat, 11 Feb 2012 12:21:08 +0100
Subject: [PATCH] [HttpFoundation] removed configuration for session storages
 in session.xml as we cannot provide a way to configure them (like before this
 PR anyway)

---
 .../FrameworkExtension.php                    |  2 +-
 .../Resources/config/session.xml              | 43 +------------------
 .../Session/SessionInterface.php              |  1 -
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 426e78cf5e..d635a7f598 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -301,7 +301,7 @@ class FrameworkExtension extends Extension
 
         $this->addClassesToCompile(array(
             'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
-            'Symfony\\Component\\HttpFoundation\\Session\Storage\\SessionStorageInterface',
+            'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface',
             $container->getDefinition('session')->getClass(),
         ));
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 845bd2b501..41f9a1d6d1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -9,16 +9,7 @@
         <parameter key="session.flashbag.class">Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag</parameter>
         <parameter key="session.attribute_bag.class">Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag</parameter>
         <parameter key="session.storage.native_file.class">Symfony\Component\HttpFoundation\Session\Storage\NativeFileSessionStorage</parameter>
-        <parameter key="session.storage.null.class">Symfony\Component\HttpFoundation\Session\Storage\NullSessionStorage</parameter>
-        <parameter key="session.storage.native_memcache.class">Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheSessionStorage</parameter>
-        <parameter key="session.storage.native_memcached.class">Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedSessionStorage</parameter>
-        <parameter key="session.storage.native_sqlite.class">Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteSessionStorage</parameter>
-        <parameter key="session.storage.memcache.class">Symfony\Component\HttpFoundation\Session\Storage\MemcacheSessionStorage</parameter>
-        <parameter key="session.storage.memcached.class">Symfony\Component\HttpFoundation\Session\Storage\MemcachedSessionStorage</parameter>
         <parameter key="session.storage.mock_file.class">Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage</parameter>
-        <parameter key="session.memcache.class">Memcache</parameter>
-        <parameter key="session.memcached.class">Memcached</parameter>
-
         <parameter key="session_listener.class">Symfony\Bundle\FrameworkBundle\EventListener\SessionListener</parameter>
     </parameters>
 
@@ -30,9 +21,8 @@
         </service>
 
         <service id="session.flash_bag" class="%session.flashbag.class%" public="false" />
+
         <service id="session.attribute_bag" class="%session.attribute_bag.class%" public="false" />
-        <service id="session.memcache" class="%session.memcache.class%" public="false" />
-        <service id="session.memcached" class="%session.memcached.class%" public="false" />
 
         <service id="session.storage.mock_file" class="%session.storage.mock_file.class%" public="false">
             <argument>%kernel.cache_dir%/sessions</argument>
@@ -44,37 +34,6 @@
             <argument>%session.storage.options%</argument>
         </service>
 
-        <service id="session.storage.native_memcache" class="%session.storage.native_memcache.class%" public="false">
-            <argument>tcp://127.0.0.1:11211?persistent=0</argument>
-            <argument>%session.storage.options%</argument>
-        </service>
-
-        <service id="session.storage.native_memcached" class="%session.storage.native_memcached.class%" public="false">
-            <argument>127.0.0.1:11211</argument>
-            <argument>%session.storage.options%</argument>
-        </service>
-
-        <service id="session.storage.memcache" class="%session.storage.memcache.class%" public="false">
-            <argument type="service" id="session.memcache" />
-            <argument>tcp://127.0.0.1:11211?persistent=0</argument>
-            <argument>%session.storage.options%</argument>
-        </service>
-
-        <service id="session.storage.memcached" class="%session.storage.memcached.class%" public="false">
-            <argument type="service" id="session.memcached" />
-            <argument>tcp://127.0.0.1:11211?persistent=0</argument>
-            <argument>%session.storage.options%</argument>
-        </service>
-
-        <service id="session.storage.native_sqlite" class="%session.storage.native_sqlite.class%" public="false">
-            <argument>%kernel.cache_dir%/sf2_sqlite_sess.db</argument>
-            <argument>%session.storage.options%</argument>
-        </service>
-
-        <service id="session.storage.null" class="%session.storage.null.class%" public="false">
-            <argument>%session.storage.options%</argument>
-        </service>
-
         <service id="session_listener" class="%session_listener.class%">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="service_container" />
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
index 1b4b7bfdbc..c31da6d165 100644
--- a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
+++ b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpFoundation\Session;
 
-
 /**
  * Interface for the session.
  *