reverted 5b7ef11 (Simplify session

storage class names now we have a separate namespace for sessions)

CHANGELOG-2.1.md

@@ -239,11 +239,11 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
    `getFlash()`, `hasFlash()`, andd `removeFlash()`.  `getFlashes() returns a `FlashBagInterface`.
  * `Session->clear()` now only clears session attributes as before it cleared flash messages and
    attributes. `Session->getFlashes()->all()` clears flashes now.
- * Added `Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage` base class for
+ * Added `Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage` base class for
    session storage drivers.
  * Added `Symfony\Component\HttpFoundation\Session\Storage\SaveHandlerInterface` interface
    which storage drivers should implement after inheriting from
-   `Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage` when writing custom session save handlers.
+   `Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage` when writing custom session save handlers.
  * [BC BREAK] `StorageInterface` methods removed: `write()`, `read()` and `remove()`.  Added
    `getBag()`, `registerBag()`.
  * Moved attribute storage to `Symfony\Component\HttpFoundation\Attribute\AttributeBagInterface`.
@@ -252,10 +252,10 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * Added `Symfony\Component\HttpFoundation\Attribute\NamespacedAttributeBag` for namespace session attributes.
  * Session now implements `Symfony\Component\HttpFoundation\Session\SessionInterface` making
    implementation customizable and portable.
- * [BC BREAK] Removed `NativeStorage` and replaced with `NativeFileStorage`.
+ * [BC BREAK] Removed `NativeSessionStorage` and replaced with `NativeFileSessionStorage`.
  * Added session storage drivers for PHP native Memcache, Memcached and SQLite session save handlers.
  * Added session storage drivers for custom Memcache, Memcached and Null session save handlers.
- * Removed `FilesystemStorage`, use `MockFileStorage` for functional testing instead.
+ * Removed `FilesystemSessionStorage`, use `MockFileSessionStorage` for functional testing instead.
 
 ### HttpKernel
 

UPGRADE-2.1.md

@@ -301,9 +301,9 @@ UPGRADE FROM 2.0 to 2.1
 * Session storage drivers
 
   Session storage drivers should inherit from
-  `Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage`
+  `Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage`
   and no longer should implement `read()`, `write()`, `remove()` which were removed from the
-  `StorageInterface`.
+  `SessionStorageInterface`.
 
   Any session storage driver that wants to use custom save handlers should
   implement `Symfony\Component\HttpFoundation\Session\Storage\SaveHandlerInterface`

src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php

@@ -3,8 +3,8 @@
 namespace Symfony\Bridge\Doctrine\HttpFoundation;
 
 use Doctrine\DBAL\Platforms\MySqlPlatform;
-use Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage;
-use Symfony\Component\HttpFoundation\Session\Storage\SaveHandlerInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\SessionSaveHandlerInterface;
 use Doctrine\DBAL\Driver\Connection;
 
 /**
@@ -13,7 +13,7 @@
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class DbalStorage extends AbstractStorage implements SaveHandlerInterface
+class DbalSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
 {
     /**
      * @var Connection

src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php

@@ -9,7 +9,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-final class DbalStorageSchema extends Schema
+final class DbalSessionStorageSchema extends Schema
 {
     private $tableName;
 

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -301,7 +301,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
 
         $this->addClassesToCompile(array(
             'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
-            'Symfony\\Component\\HttpFoundation\\Session\Storage\\StorageInterface',
+            'Symfony\\Component\\HttpFoundation\\Session\Storage\\SessionStorageInterface',
             $container->getDefinition('session')->getClass(),
         ));
 

src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml

@@ -8,14 +8,14 @@
         <parameter key="session.class">Symfony\Component\HttpFoundation\Session\Session</parameter>
         <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\NativeFileStorage</parameter>
-        <parameter key="session.storage.null.class">Symfony\Component\HttpFoundation\Session\Storage\NullStorage</parameter>
-        <parameter key="session.storage.native_memcache.class">Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheStorage</parameter>
-        <parameter key="session.storage.native_memcached.class">Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedStorage</parameter>
-        <parameter key="session.storage.native_sqlite.class">Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteStorage</parameter>
-        <parameter key="session.storage.memcache.class">Symfony\Component\HttpFoundation\Session\Storage\MemcacheStorage</parameter>
-        <parameter key="session.storage.memcached.class">Symfony\Component\HttpFoundation\Session\Storage\MemcachedStorage</parameter>
-        <parameter key="session.storage.mock_file.class">Symfony\Component\HttpFoundation\Session\Storage\MockFileStorage</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>
 

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php

@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper;
 
 class SessionHelperTest extends \PHPUnit_Framework_TestCase
@@ -24,7 +24,7 @@ public function setUp()
     {
         $this->request = new Request();
 
-        $session = new Session(new MockArrayStorage());
+        $session = new Session(new MockArraySessionStorage());
         $session->set('foobar', 'bar');
         $session->getFlashes()->set('notice', 'bar');
 

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php

@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Templating\TemplateNameParser;
 use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
@@ -64,7 +64,7 @@ protected function getContainer()
     {
         $container = new Container();
         $request = new Request();
-        $session = new Session(new MockArrayStorage());
+        $session = new Session(new MockArraySessionStorage());
 
         $request->setSession($session);
         $container->set('request', $request);

src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php

@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\Templating\TemplateNameParser;
 use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
 
@@ -71,7 +71,7 @@ protected function getContainer()
     {
         $container = new Container();
         $request = new Request();
-        $session = new Session(new MockArrayStorage());
+        $session = new Session(new MockArraySessionStorage());
 
         $request->setSession($session);
         $container->set('request', $request);

src/Symfony/Component/DependencyInjection/Container.php

@@ -43,8 +43,8 @@
  *
  * <ul>
  *   <li>request -> getRequestService()</li>
- *   <li>mysql_session_storage -> getMysqlStorageService()</li>
- *   <li>symfony.mysql_session_storage -> getSymfony_MysqlStorageService()</li>
+ *   <li>mysql_session_storage -> getMysqlSessionStorageService()</li>
+ *   <li>symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()</li>
  * </ul>
  *
  * The container can have three possible behaviors when a service does not exist:

src/Symfony/Component/HttpFoundation/Session/Session.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\HttpFoundation\Session;
 
-use Symfony\Component\HttpFoundation\Session\Storage\StorageInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
@@ -31,18 +31,18 @@ class Session implements SessionInterface
     /**
      * Storage driver.
      *
-     * @var StorageInterface
+     * @var SessionStorageInterface
      */
     protected $storage;
 
     /**
      * Constructor.
      *
-     * @param StorageInterface $storage A StorageInterface instance.
+     * @param SessionStorageInterface $storage A SessionStorageInterface instance.
      * @param AttributeBagInterface   $attributes An AttributeBagInterface instance, (defaults null for default AttributeBag)
      * @param FlashBagInterface       $flashes    A FlashBagInterface instance (defaults null for default FlashBag)
      */
-    public function __construct(StorageInterface $storage, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null)
+    public function __construct(SessionStorageInterface $storage, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null)
     {
         $this->storage = $storage;
         $this->registerBag($attributes ?: new AttributeBag());
@@ -204,7 +204,7 @@ public function getId()
     /**
      * Implements the \Serialize interface.
      *
-     * @return StorageInterface
+     * @return SessionStorageInterface
      */
     public function serialize()
     {
@@ -214,13 +214,13 @@ public function serialize()
     /**
      * Implements the \Serialize interface.
      *
-     * @throws \InvalidArgumentException If the passed string does not unserialize to an instance of StorageInterface
+     * @throws \InvalidArgumentException If the passed string does not unserialize to an instance of SessionStorageInterface
      */
     public function unserialize($serialized)
     {
         $storage = unserialize($serialized);
-        if (!$storage instanceof StorageInterface) {
-            throw new \InvalidArgumentException('Serialized data did not return a valid instance of StorageInterface');
+        if (!$storage instanceof SessionStorageInterface) {
+            throw new \InvalidArgumentException('Serialized data did not return a valid instance of SessionStorageInterface');
         }
 
         $this->storage = $storage;

src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php

@@ -18,7 +18,7 @@
  *
  * @author Drak <drak@zikula.org>
  */
-abstract class AbstractStorage implements StorageInterface
+abstract class AbstractSessionStorage implements SessionStorageInterface
 {
     /**
      * Array of SessionBagInterface
@@ -293,7 +293,7 @@ protected function registerSaveHandlers()
     {
         // note this can be reset to PHP's control using ini_set('session.save_handler', 'files');
         // so long as ini_set() is called before the session is started.
-        if ($this instanceof SaveHandlerInterface) {
+        if ($this instanceof SessionSaveHandlerInterface) {
             session_set_save_handler(
                 array($this, 'openSession'),
                 array($this, 'closeSession'),

src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php

@@ -12,11 +12,11 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 /**
- * MemcacheStorage.
+ * MemcacheSessionStorage.
  *
  * @author Drak <drak@zikula.org>
  */
-class MemcacheStorage extends AbstractStorage implements SaveHandlerInterface
+class MemcacheSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
 {
     /**
      * Memcache driver.
@@ -46,7 +46,7 @@ class MemcacheStorage extends AbstractStorage implements SaveHandlerInterface
      * @param array                 $memcacheOptions An associative array of Memcachge options
      * @param array                 $options         Session configuration options.
      *
-     * @see AbstractStorage::__construct()
+     * @see AbstractSessionStorage::__construct()
      */
     public function __construct(\Memcache $memcache, array $memcacheOptions = array(), array $options = array())
     {

src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php

@@ -12,11 +12,11 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 /**
- * MemcachedStorage.
+ * MemcachedSessionStorage.
  *
  * @author Drak <drak@zikula.org>
  */
-class MemcachedStorage extends AbstractStorage implements SaveHandlerInterface
+class MemcachedSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
 {
     /**
      * Memcached driver.
@@ -39,7 +39,7 @@ class MemcachedStorage extends AbstractStorage implements SaveHandlerInterface
      * @param array                 $memcachedOptions An associative array of Memcached options
      * @param array                 $options          Session configuration options.
      *
-     * @see AbstractStorage::__construct()
+     * @see AbstractSessionStorage::__construct()
      */
     public function __construct(\Memcached $memcache, array $memcachedOptions = array(), array $options = array())
     {

src/Symfony/Component/HttpFoundation/Session/Storage/MockArrayStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php

@@ -12,18 +12,18 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 /**
- * MockArrayStorage mocks the session for unit tests.
+ * MockArraySessionStorage mocks the session for unit tests.
  *
  * No PHP session is actually started since a session can be initialized
  * and shutdown only once per PHP execution cycle.
  *
- * When doing functional testing, you should use MockFileStorage instead.
+ * When doing functional testing, you should use MockFileSessionStorage instead.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
  * @author Drak <drak@zikula.org>
  */
-class MockArrayStorage extends AbstractStorage
+class MockArraySessionStorage extends AbstractSessionStorage
 {
     /**
      * @var string

src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php

@@ -12,15 +12,15 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 /**
- * MockFileStorage is used to mock sessions for
+ * MockFileSessionStorage is used to mock sessions for
  * functional testing when done in a single PHP process.
  *
  * No PHP session is actually started since a session can be initialized
  * and shutdown only once per PHP execution cycle.
  *
  * @author Drak <drak@zikula.org>
  */
-class MockFileStorage extends MockArrayStorage
+class MockFileSessionStorage extends MockArraySessionStorage
 {
     /**
      * @var string
@@ -33,7 +33,7 @@ class MockFileStorage extends MockArrayStorage
      * @param string                $savePath   Path of directory to save session files.
      * @param array                 $options    Session options.
      *
-     * @see AbstractStorage::__construct()
+     * @see AbstractSessionStorage::__construct()
      */
     public function __construct($savePath = null, array $options = array())
     {

src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php

@@ -12,13 +12,13 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 /**
- * NativeFileStorage.
+ * NativeFileSessionStorage.
  *
  * Native session handler using PHP's built in file storage.
  *
  * @author Drak <drak@zikula.org>
  */
-class NativeFileStorage extends AbstractStorage
+class NativeFileSessionStorage extends AbstractSessionStorage
 {
     /**
      * @var string
@@ -31,7 +31,7 @@ class NativeFileStorage extends AbstractStorage
      * @param string                $savePath   Path of directory to save session files.
      * @param array                 $options    Session configuration options.
      *
-     * @see AbstractStorage::__construct()
+     * @see AbstractSessionStorage::__construct()
      */
     public function __construct($savePath = null, array $options = array())
     {

src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheStorage.php → src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php

@@ -12,13 +12,13 @@
 namespace Symfony\Component\HttpFoundation\Session\Storage;
 
 /**
- * NativeMemcacheStorage.
+ * NativeMemcacheSessionStorage.
  *
  * Session based on native PHP memcache database handler.
  *
  * @author Drak <drak@zikula.org>
  */
-class NativeMemcacheStorage extends AbstractStorage
+class NativeMemcacheSessionStorage extends AbstractSessionStorage
 {
     /**
      * @var string
@@ -31,7 +31,7 @@ class NativeMemcacheStorage extends AbstractStorage
      * @param string                $savePath   Path of memcache server.
      * @param array                 $options    Session configuration options.
      *
-     * @see AbstractStorage::__construct()
+     * @see AbstractSessionStorage::__construct()
      */
     public function __construct($savePath = 'tcp://127.0.0.1:11211?persistent=0', array $options = array())
     {