From 39813a0a05440013f80c1637a8151f127c2a21f6 Mon Sep 17 00:00:00 2001
From: Drak <drak@zikula.org>
Date: Fri, 13 Jul 2012 14:54:32 +0100
Subject: [PATCH] Revert "[FrameworkBundle] Refactor session file handler
 service name and update changelogs"

This partially reverts commit 13a2c82f01a8d9c7885bd4afe268b2bd75a58e55.
---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md              | 2 +-
 .../Bundle/FrameworkBundle/Resources/config/session.xml      | 5 ++---
 src/Symfony/Component/HttpFoundation/CHANGELOG.md            | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index da9db7ca3e..16039c92ee 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -26,7 +26,7 @@ CHANGELOG
  * [BC BREAK] following session options: 'lifetime', 'path', 'domain', 'secure',
    'httponly' are now prefixed with cookie_ when dumped to the container
  * Added `handler_id` configuration under `session` key to represent `session.handler`
-   service, defaults to `session.handler.file`.
+   service, defaults to `session.handler.native_file`.
  * Added `gc_maxlifetime`, `gc_probability`, and `gc_divisor` to session
    configuration. This means session garbage collection has a
   `gc_probability`/`gc_divisor` chance of being run. The `gc_maxlifetime` defines
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
index 27631583d1..871ea3ab9c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -10,7 +10,7 @@
         <parameter key="session.attribute_bag.class">Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag</parameter>
         <parameter key="session.storage.native.class">Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage</parameter>
         <parameter key="session.storage.mock_file.class">Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage</parameter>
-        <parameter key="session.handler.file.class">Symfony\Component\HttpFoundation\Session\Storage\Handler\FileSessionHandler</parameter>
+        <parameter key="session.handler.native_file.class">Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler</parameter>
         <parameter key="session_listener.class">Symfony\Bundle\FrameworkBundle\EventListener\SessionListener</parameter>
     </parameters>
 
@@ -34,7 +34,7 @@
             <argument>%kernel.cache_dir%/sessions</argument>
         </service>
 
-        <service id="session.handler.file" class="%session.handler.file.class%" public="false">
+        <service id="session.handler.native_file" class="%session.handler.native_file.class%" public="false">
             <argument>%session.save_path%</argument>
         </service>
 
@@ -45,6 +45,5 @@
 
         <!-- for BC -->
         <service id="session.storage.filesystem" alias="session.storage.mock_file" />
-        <service id="session.handler.native_file" alias="session.handler.file" />
     </services>
 </container>
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
index 5525f2b057..94f64815fb 100644
--- a/src/Symfony/Component/HttpFoundation/CHANGELOG.md
+++ b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -22,7 +22,8 @@ CHANGELOG
  * [BC BREAK] Moved all session related classes and interfaces into own namespace, as
    `Symfony\Component\HttpFoundation\Session` and renamed classes accordingly.
    Session handlers are located in the subnamespace `Symfony\Component\HttpFoundation\Session\Handler`.
- * SessionHandlers must implement `\SessionHandlerInterface`.
+ * SessionHandlers must implement `\SessionHandlerInterface` or extend from the
+   `Symfony\Component\HttpFoundation\Storage\Handler\NativeSessionHandler` base class.
  * Added internal storage driver proxy mechanism for forward compatibility with
    PHP 5.4 `\SessionHandler` class.
  * Added session handlers for custom Memcache, Memcached and Null session save handlers.