Browse files

[HttpFoundation] Simplify session storage class names now we have a s…

…eparate namespace for sessions.
  • Loading branch information...
1 parent 27530cb commit 5b7ef116507fa05e1042065f61a50733c19116cb Drak committed Feb 9, 2012
Showing with 131 additions and 127 deletions.
  1. +16 −12 CHANGELOG-2.1.md
  2. +2 −2 UPGRADE-2.1.md
  3. +2 −2 src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php
  4. +1 −1 src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php
  5. +1 −1 src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
  6. +8 −8 src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
  7. +2 −2 src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php
  8. +2 −2 src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php
  9. +2 −2 src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
  10. +2 −2 src/Symfony/Component/DependencyInjection/Container.php
  11. +8 −8 src/Symfony/Component/HttpFoundation/Session/Session.php
  12. +2 −2 ...mfony/Component/HttpFoundation/Session/Storage/{AbstractSessionStorage.php → AbstractStorage.php}
  13. +3 −3 ...mfony/Component/HttpFoundation/Session/Storage/{MemcacheSessionStorage.php → MemcacheStorage.php}
  14. +3 −3 ...ony/Component/HttpFoundation/Session/Storage/{MemcachedSessionStorage.php → MemcachedStorage.php}
  15. +3 −3 ...ony/Component/HttpFoundation/Session/Storage/{MockArraySessionStorage.php → MockArrayStorage.php}
  16. +3 −3 ...mfony/Component/HttpFoundation/Session/Storage/{MockFileSessionStorage.php → MockFileStorage.php}
  17. +3 −3 ...y/Component/HttpFoundation/Session/Storage/{NativeFileSessionStorage.php → NativeFileStorage.php}
  18. +3 −3 ...ent/HttpFoundation/Session/Storage/{NativeMemcacheSessionStorage.php → NativeMemcacheStorage.php}
  19. +3 −3 ...t/HttpFoundation/Session/Storage/{NativeMemcachedSessionStorage.php → NativeMemcachedStorage.php}
  20. +3 −3 ...mponent/HttpFoundation/Session/Storage/{NativeSqliteSessionStorage.php → NativeSqliteStorage.php}
  21. +2 −2 src/Symfony/Component/HttpFoundation/Session/Storage/{NullSessionStorage.php → NullStorage.php}
  22. +4 −4 src/Symfony/Component/HttpFoundation/Session/Storage/{PdoSessionStorage.php → PdoStorage.php}
  23. +1 −1 ...onent/HttpFoundation/Session/Storage/{SessionSaveHandlerInterface.php → SaveHandlerInterface.php}
  24. +1 −1 ...ony/Component/HttpFoundation/Session/Storage/{SessionStorageInterface.php → StorageInterface.php}
  25. +3 −3 tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php
  26. +3 −3 tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php
  27. +11 −11 ...mponent/HttpFoundation/Session/Storage/{AbstractSessionStorageTest.php → AbstractStorageTest.php}
  28. +5 −5 ...onent/HttpFoundation/Session/Storage/{MockArraySessionStorageTest.php → MockArrayStorageTest.php}
  29. +5 −5 ...mponent/HttpFoundation/Session/Storage/{MockFileSessionStorageTest.php → MockFileStorageTest.php}
  30. +4 −4 ...ent/HttpFoundation/Session/Storage/{NativeFileSessionStorageTest.php → NativeFileStorageTest.php}
  31. +4 −4 ...Foundation/Session/Storage/{NativeMemcacheSessionStorageTest.php → NativeMemcacheStorageTest.php}
  32. +4 −4 ...undation/Session/Storage/{NativeMemcachedSessionStorageTest.php → NativeMemcachedStorageTest.php}
  33. +4 −4 ...HttpFoundation/Session/Storage/{NativeSqliteSessionStorageTest.php → NativeSqliteStorageTest.php}
  34. +6 −6 ...Tests/Component/HttpFoundation/Session/Storage/{NullSessionStorageTest.php → NullStorageTest.php}
  35. +2 −2 tests/Symfony/Tests/Component/Security/Http/Firewall/ContextListenerTest.php
View
28 CHANGELOG-2.1.md
@@ -230,7 +230,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
* added ResponseHeaderBag::makeDisposition() (implements RFC 6266)
* made mimetype to extension conversion configurable
* [BC BREAK] Moved all session related classes and interfaces into own namespace, as
- `Symfony\Component\HttpFoudation\Session`.
+ `Symfony\Component\HttpFoudation\Session` and renamed classes accordingly.
* Flashes are now stored as a bucket of messages per `$type` so there can be multiple messages per type.
There are four interface constants for type, `FlashBagInterface::INFO`, `FlashBagInterface::NOTICE`,
`FlashBagInterface::WARNING` and `FlashBagInterface::ERROR`.
@@ -242,19 +242,23 @@ 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()->popAll()` clears flashes now.
- * Added `AbstractSessionStorage` base class for session storage drivers.
- * Added `SessionSaveHandler` interface which storage drivers should implement after inheriting from
- `AbstractSessionStorage` when writing custom session save handlers.
- * [BC BREAK] `SessionStorageInterface` methods removed: `write()`, `read()` and `remove()`. Added
- `getAttributes()`, `getFlashes()`.
- * Moved attribute storage to `AttributeBagInterface`.
- * Added `AttributeBag` to replicate attributes storage behaviour from 2.0.x (default).
- * Added `NamespacedAttributeBag` for namespace session attributes.
- * Session now implements `SessionInterface` making implementation customizable and portable.
- * [BC BREAK] Removed `NativeSessionStorage` and replaced with `NativeFileSessionStorage`.
+ * Added `Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage` 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.
+ * [BC BREAK] `StorageInterface` methods removed: `write()`, `read()` and `remove()`. Added
+ `getBag()`, `registerBag()`.
+ * Moved attribute storage to `Symfony\Component\HttpFoundation\Attribute\AttributeBagInterface`.
+ * Added `Symfony\Component\HttpFoundation\Attribute\AttributeBag` to replicate attributes storage
+ behaviour from 2.0.x (default).
+ * 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`.
* 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 `FilesystemSessionStorage`, use `MockFileSessionStorage` for functional testing instead.
+ * Removed `FilesystemStorage`, use `MockFileStorage` for functional testing instead.
### HttpKernel
View
4 UPGRADE-2.1.md
@@ -313,9 +313,9 @@ UPGRADE FROM 2.0 to 2.1
* Session storage drivers
Session storage drivers should inherit from
- `Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage`
+ `Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage`
and no longer should implement `read()`, `write()`, `remove()` which were removed from the
- `SessionStorageInterface`.
+ `StorageInterface`.
Any session storage driver that wants to use custom save handlers should
implement `Symfony\Component\HttpFoundation\Session\Storage\SessionSaveHandlerInterface`
View
4 src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php
@@ -3,7 +3,7 @@
namespace Symfony\Bridge\Doctrine\HttpFoundation;
use Doctrine\DBAL\Platforms\MySqlPlatform;
-use Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage;
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 DbalSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
+class DbalStorage extends AbstractStorage implements SessionSaveHandlerInterface
{
/**
* @var Connection
View
2 src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php
@@ -9,7 +9,7 @@
*
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
*/
-final class DbalSessionStorageSchema extends Schema
+final class DbalStorageSchema extends Schema
{
private $tableName;
View
2 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\\SessionStorageInterface',
+ 'Symfony\\Component\\HttpFoundation\\Session\Storage\\StorageInterface',
$container->getDefinition('session')->getClass(),
));
View
16 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\FlashBag</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.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.memcache.class">Memcache</parameter>
<parameter key="session.memcached.class">Memcached</parameter>
View
4 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\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
use Symfony\Bundle\FrameworkBundle\Templating\Helper\SessionHelper;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
@@ -26,7 +26,7 @@ public function setUp()
{
$this->request = new Request();
- $session = new Session(new MockArraySessionStorage());
+ $session = new Session(new MockArrayStorage());
$session->set('foobar', 'bar');
$session->getFlashes()->set(FlashBag::NOTICE, 'bar');
View
4 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\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
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 MockArraySessionStorage());
+ $session = new Session(new MockArrayStorage());
$request->setSession($session);
$container->set('request', $request);
View
4 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\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
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 MockArraySessionStorage());
+ $session = new Session(new MockArrayStorage());
$request->setSession($session);
$container->set('request', $request);
View
4 src/Symfony/Component/DependencyInjection/Container.php
@@ -43,8 +43,8 @@
*
* <ul>
* <li>request -> getRequestService()</li>
- * <li>mysql_session_storage -> getMysqlSessionStorageService()</li>
- * <li>symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()</li>
+ * <li>mysql_session_storage -> getMysqlStorageService()</li>
+ * <li>symfony.mysql_session_storage -> getSymfony_MysqlStorageService()</li>
* </ul>
*
* The container can have three possible behaviors when a service does not exist:
View
16 src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\HttpFoundation\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\StorageInterface;
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 SessionStorageInterface
+ * @var StorageInterface
*/
protected $storage;
/**
* Constructor.
*
- * @param SessionStorageInterface $storage A SessionStorageInterface instance.
+ * @param StorageInterface $storage A StorageInterface 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(SessionStorageInterface $storage, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null)
+ public function __construct(StorageInterface $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 SessionStorageInterface
+ * @return StorageInterface
*/
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 SessionStorageInterface
+ * @throws \InvalidArgumentException If the passed string does not unserialize to an instance of StorageInterface
*/
public function unserialize($serialized)
{
$storage = unserialize($serialized);
- if (!$storage instanceof SessionStorageInterface) {
- throw new \InvalidArgumentException('Serialized data did not return a valid instance of SessionStorageInterface');
+ if (!$storage instanceof StorageInterface) {
+ throw new \InvalidArgumentException('Serialized data did not return a valid instance of StorageInterface');
}
$this->storage = $storage;
View
4 ...ession/Storage/AbstractSessionStorage.php → ...ation/Session/Storage/AbstractStorage.php
@@ -22,7 +22,7 @@
*
* @author Drak <drak@zikula.org>
*/
-abstract class AbstractSessionStorage implements SessionStorageInterface
+abstract class AbstractStorage implements StorageInterface
{
/**
* Array of SessionBagInterface
@@ -297,7 +297,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 SessionSaveHandlerInterface) {
+ if ($this instanceof SaveHandlerInterface) {
session_set_save_handler(
array($this, 'openSession'),
array($this, 'closeSession'),
View
6 ...ession/Storage/MemcacheSessionStorage.php → ...ation/Session/Storage/MemcacheStorage.php
@@ -12,11 +12,11 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * MemcacheSessionStorage.
+ * MemcacheStorage.
*
* @author Drak <drak@zikula.org>
*/
-class MemcacheSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
+class MemcacheStorage extends AbstractStorage implements SaveHandlerInterface
{
/**
* Memcache driver.
@@ -46,7 +46,7 @@ class MemcacheSessionStorage extends AbstractSessionStorage implements SessionSa
* @param array $memcacheOptions An associative array of Memcachge options
* @param array $options Session configuration options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct(\Memcache $memcache, array $memcacheOptions = array(), array $options = array())
{
View
6 ...ssion/Storage/MemcachedSessionStorage.php → ...tion/Session/Storage/MemcachedStorage.php
@@ -12,11 +12,11 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * MemcachedSessionStorage.
+ * MemcachedStorage.
*
* @author Drak <drak@zikula.org>
*/
-class MemcachedSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
+class MemcachedStorage extends AbstractStorage implements SaveHandlerInterface
{
/**
* Memcached driver.
@@ -39,7 +39,7 @@ class MemcachedSessionStorage extends AbstractSessionStorage implements SessionS
* @param array $memcachedOptions An associative array of Memcached options
* @param array $options Session configuration options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct(\Memcached $memcache, array $memcachedOptions = array(), array $options = array())
{
View
6 ...ssion/Storage/MockArraySessionStorage.php → ...tion/Session/Storage/MockArrayStorage.php
@@ -12,18 +12,18 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * MockArraySessionStorage mocks the session for unit tests.
+ * MockArrayStorage 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 MockFileSessionStorage instead.
+ * When doing functional testing, you should use MockFileStorage instead.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Bulat Shakirzyanov <mallluhuct@gmail.com>
* @author Drak <drak@zikula.org>
*/
-class MockArraySessionStorage extends AbstractSessionStorage
+class MockArrayStorage extends AbstractStorage
{
/**
* @var string
View
6 ...ession/Storage/MockFileSessionStorage.php → ...ation/Session/Storage/MockFileStorage.php
@@ -12,15 +12,15 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * MockFileSessionStorage is used to mock sessions for
+ * MockFileStorage 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 MockFileSessionStorage extends MockArraySessionStorage
+class MockFileStorage extends MockArrayStorage
{
/**
* @var string
@@ -33,7 +33,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
* @param string $savePath Path of directory to save session files.
* @param array $options Session options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct($savePath = null, array $options = array())
{
View
6 ...sion/Storage/NativeFileSessionStorage.php → ...ion/Session/Storage/NativeFileStorage.php
@@ -12,13 +12,13 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * NativeFileSessionStorage.
+ * NativeFileStorage.
*
* Native session handler using PHP's built in file storage.
*
* @author Drak <drak@zikula.org>
*/
-class NativeFileSessionStorage extends AbstractSessionStorage
+class NativeFileStorage extends AbstractStorage
{
/**
* @var string
@@ -31,7 +31,7 @@ class NativeFileSessionStorage extends AbstractSessionStorage
* @param string $savePath Path of directory to save session files.
* @param array $options Session configuration options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct($savePath = null, array $options = array())
{
View
6 .../Storage/NativeMemcacheSessionStorage.php → ...Session/Storage/NativeMemcacheStorage.php
@@ -12,13 +12,13 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * NativeMemcacheSessionStorage.
+ * NativeMemcacheStorage.
*
* Session based on native PHP memcache database handler.
*
* @author Drak <drak@zikula.org>
*/
-class NativeMemcacheSessionStorage extends AbstractSessionStorage
+class NativeMemcacheStorage extends AbstractStorage
{
/**
* @var string
@@ -31,7 +31,7 @@ class NativeMemcacheSessionStorage extends AbstractSessionStorage
* @param string $savePath Path of memcache server.
* @param array $options Session configuration options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct($savePath = 'tcp://127.0.0.1:11211?persistent=0', array $options = array())
{
View
6 ...Storage/NativeMemcachedSessionStorage.php → ...ession/Storage/NativeMemcachedStorage.php
@@ -12,13 +12,13 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * NativeMemcachedSessionStorage.
+ * NativeMemcachedStorage.
*
* Session based on native PHP memcached database handler.
*
* @author Drak <drak@zikula.org>
*/
-class NativeMemcachedSessionStorage extends AbstractSessionStorage
+class NativeMemcachedStorage extends AbstractStorage
{
/**
* @var string
@@ -31,7 +31,7 @@ class NativeMemcachedSessionStorage extends AbstractSessionStorage
* @param string $savePath Comma separated list of servers: e.g. memcache1.example.com:11211,memcache2.example.com:11211
* @param array $options Session configuration options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct($savePath = '127.0.0.1:11211', array $options = array())
{
View
6 ...on/Storage/NativeSqliteSessionStorage.php → ...n/Session/Storage/NativeSqliteStorage.php
@@ -12,13 +12,13 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * NativeSqliteSessionStorage.
+ * NativeSqliteStorage.
*
* Session based on native PHP sqlite database handler.
*
* @author Drak <drak@zikula.org>
*/
-class NativeSqliteSessionStorage extends AbstractSessionStorage
+class NativeSqliteStorage extends AbstractStorage
{
/**
* @var string
@@ -31,7 +31,7 @@ class NativeSqliteSessionStorage extends AbstractSessionStorage
* @param string $dbPath Path to SQLite database file.
* @param array $options Session configuration options.
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct($dbPath, array $options = array())
{
View
4 ...on/Session/Storage/NullSessionStorage.php → ...oundation/Session/Storage/NullStorage.php
@@ -12,15 +12,15 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * NullSessionStorage.
+ * NullStorage.
*
* Can be used in unit testing or in a sitation where persisted sessions are not desired.
*
* @author Drak <drak@zikula.org>
*
* @api
*/
-class NullSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
+class NullStorage extends AbstractStorage implements SaveHandlerInterface
{
/**
* {@inheritdoc}
View
8 ...ion/Session/Storage/PdoSessionStorage.php → ...Foundation/Session/Storage/PdoStorage.php
@@ -12,12 +12,12 @@
namespace Symfony\Component\HttpFoundation\Session\Storage;
/**
- * PdoSessionStorage.
+ * PdoStorage.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Michael Williams <michael.williams@funsational.com>
*/
-class PdoSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
+class PdoStorage extends AbstractStorage implements SaveHandlerInterface
{
/**
* PDO instance.
@@ -44,12 +44,12 @@ class PdoSessionStorage extends AbstractSessionStorage implements SessionSaveHan
*
* @throws \InvalidArgumentException When "db_table" option is not provided
*
- * @see AbstractSessionStorage::__construct()
+ * @see AbstractStorage::__construct()
*/
public function __construct(\PDO $pdo, array $dbOptions = array(), array $options = array())
{
if (!array_key_exists('db_table', $dbOptions)) {
- throw new \InvalidArgumentException('You must provide the "db_table" option for a PdoSessionStorage.');
+ throw new \InvalidArgumentException('You must provide the "db_table" option for a PdoStorage.');
}
$this->pdo = $pdo;
View
2 ...n/Storage/SessionSaveHandlerInterface.php → .../Session/Storage/SaveHandlerInterface.php
@@ -52,7 +52,7 @@
*
* @author Drak <drak@zikula.org>
*/
-interface SessionSaveHandlerInterface
+interface SaveHandlerInterface
{
/**
* Open session.
View
2 ...ssion/Storage/SessionStorageInterface.php → ...tion/Session/Storage/StorageInterface.php
@@ -21,7 +21,7 @@
*
* @api
*/
-interface SessionStorageInterface
+interface StorageInterface
{
/**
* Starts the session.
View
6 tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php
@@ -12,7 +12,7 @@
namespace Symfony\Tests\Component\HttpFoundation;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Request;
@@ -846,7 +846,7 @@ public function testHasSession()
$request = new Request;
$this->assertFalse($request->hasSession());
- $request->setSession(new Session(new MockArraySessionStorage()));
+ $request->setSession(new Session(new MockArrayStorage()));
$this->assertTrue($request->hasSession());
}
@@ -857,7 +857,7 @@ public function testHasPreviousSession()
$this->assertFalse($request->hasPreviousSession());
$request->cookies->set(session_name(), 'foo');
$this->assertFalse($request->hasPreviousSession());
- $request->setSession(new Session(new MockArraySessionStorage()));
+ $request->setSession(new Session(new MockArrayStorage()));
$this->assertTrue($request->hasPreviousSession());
}
View
6 tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php
@@ -16,7 +16,7 @@
use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
/**
* SessionTest
@@ -28,7 +28,7 @@
class SessionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface
+ * @var \Symfony\Component\HttpFoundation\Session\Storage\StorageInterface
*/
protected $storage;
@@ -39,7 +39,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $this->storage = new MockArraySessionStorage();
+ $this->storage = new MockArrayStorage();
$this->session = new Session($this->storage, new AttributeBag(), new FlashBag());
}
View
22 ...on/Storage/AbstractSessionStorageTest.php → ...n/Session/Storage/AbstractStorageTest.php
@@ -2,21 +2,21 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
-use Symfony\Component\HttpFoundation\Session\Storage\SessionSaveHandlerInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\SaveHandlerInterface;
/**
- * Turn AbstractSessionStorage into something concrete because
+ * Turn AbstractStorage into something concrete because
* certain mocking features are broken in PHPUnit-Mock-Objects < 1.1.2
* @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/73
*/
-class ConcreteSessionStorage extends AbstractSessionStorage
+class ConcreteStorage extends AbstractStorage
{
}
-class CustomHandlerSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface
+class CustomHandlerStorage extends AbstractStorage implements SaveHandlerInterface
{
public function openSession($path, $id)
{
@@ -44,22 +44,22 @@ public function gcSession($lifetime)
}
/**
- * Test class for AbstractSessionStorage.
+ * Test class for AbstractStorage.
*
* @author Drak <drak@zikula.org>
*
* These tests require separate processes.
*
* @runTestsInSeparateProcesses
*/
-class AbstractSessionStorageTest extends \PHPUnit_Framework_TestCase
+class AbstractStorageTest extends \PHPUnit_Framework_TestCase
{
/**
- * @return AbstractSessionStorage
+ * @return AbstractStorage
*/
protected function getStorage()
{
- $storage = new CustomHandlerSessionStorage();
+ $storage = new CustomHandlerStorage();
$storage->registerBag(new AttributeBag);
return $storage;
@@ -115,13 +115,13 @@ public function testRegenerateDestroy()
public function testCustomSaveHandlers()
{
- $storage = new CustomHandlerSessionStorage();
+ $storage = new CustomHandlerStorage();
$this->assertEquals('user', ini_get('session.save_handler'));
}
public function testNativeSaveHandlers()
{
- $storage = new ConcreteSessionStorage();
+ $storage = new ConcreteStorage();
$this->assertNotEquals('user', ini_get('session.save_handler'));
}
}
View
10 ...n/Storage/MockArraySessionStorageTest.php → .../Session/Storage/MockArrayStorageTest.php
@@ -2,20 +2,20 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
/**
- * Test class for MockArraySessionStorage.
+ * Test class for MockArrayStorage.
*
* @author Drak <drak@zikula.org>
*/
-class MockArraySessionStorageTest extends \PHPUnit_Framework_TestCase
+class MockArrayStorageTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var MockArraySessionStorage
+ * @var MockArrayStorage
*/
private $storage;
@@ -41,7 +41,7 @@ protected function setUp()
$this->flashes->getStorageKey() => array('notice' => 'hello'),
);
- $this->storage = new MockArraySessionStorage();
+ $this->storage = new MockArrayStorage();
$this->storage->registerBag($this->flashes);
$this->storage->registerBag($this->attributes);
$this->storage->setSessionData($this->data);
View
10 ...on/Storage/MockFileSessionStorageTest.php → ...n/Session/Storage/MockFileStorageTest.php
@@ -2,24 +2,24 @@
namespace Symfony\Test\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockFileStorage;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
/**
- * Test class for MockFileSessionStorage.
+ * Test class for MockFileStorage.
*
* @author Drak <drak@zikula.org>
*/
-class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase
+class MockFileStorageTest extends \PHPUnit_Framework_TestCase
{
/**
* @var string
*/
private $sessionDir;
/**
- * @var FileMockSessionStorage
+ * @var FileMockStorage
*/
protected $storage;
@@ -96,7 +96,7 @@ public function testMultipleInstances()
private function getStorage(array $options = array())
{
- $storage = new MockFileSessionStorage($this->sessionDir, $options);
+ $storage = new MockFileStorage($this->sessionDir, $options);
$storage->registerBag(new FlashBag);
$storage->registerBag(new AttributeBag);
View
8 .../Storage/NativeFileSessionStorageTest.php → ...Session/Storage/NativeFileStorageTest.php
@@ -2,22 +2,22 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeFileSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeFileStorage;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
/**
- * Test class for NativeFileSessionStorage.
+ * Test class for NativeFileStorage.
*
* @author Drak <drak@zikula.org>
*
* @runTestsInSeparateProcesses
*/
-class NativeFileSessionStorageTest extends \PHPUnit_Framework_TestCase
+class NativeFileStorageTest extends \PHPUnit_Framework_TestCase
{
public function testSaveHandlers()
{
- $storage = new NativeFileSessionStorage(sys_get_temp_dir(), array('name' => 'TESTING'));
+ $storage = new NativeFileStorage(sys_get_temp_dir(), array('name' => 'TESTING'));
$this->assertEquals('files', ini_get('session.save_handler'));
$this->assertEquals(sys_get_temp_dir(), ini_get('session.save_path'));
$this->assertEquals('TESTING', ini_get('session.name'));
View
8 ...rage/NativeMemcacheSessionStorageTest.php → ...ion/Storage/NativeMemcacheStorageTest.php
@@ -2,26 +2,26 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheStorage;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
/**
- * Test class for NativeMemcacheSessionStorage.
+ * Test class for NativeMemcacheStorage.
*
* @author Drak <drak@zikula.org>
*
* @runTestsInSeparateProcesses
*/
-class NativeMemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase
+class NativeMemcacheStorageTest extends \PHPUnit_Framework_TestCase
{
public function testSaveHandlers()
{
if (!extension_loaded('memcache')) {
$this->markTestSkipped('Skipped tests SQLite extension is not present');
}
- $storage = new NativeMemcacheSessionStorage('tcp://127.0.0.1:11211?persistent=0', array('name' => 'TESTING'));
+ $storage = new NativeMemcacheStorage('tcp://127.0.0.1:11211?persistent=0', array('name' => 'TESTING'));
$this->assertEquals('memcache', ini_get('session.save_handler'));
$this->assertEquals('tcp://127.0.0.1:11211?persistent=0', ini_get('session.save_path'));
$this->assertEquals('TESTING', ini_get('session.name'));
View
8 ...age/NativeMemcachedSessionStorageTest.php → ...on/Storage/NativeMemcachedStorageTest.php
@@ -2,18 +2,18 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedStorage;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
/**
- * Test class for NativeMemcachedSessionStorage.
+ * Test class for NativeMemcachedStorage.
*
* @author Drak <drak@zikula.org>
*
* @runTestsInSeparateProcesses
*/
-class NativeMemcachedSessionStorageTest extends \PHPUnit_Framework_TestCase
+class NativeMemcachedStorageTest extends \PHPUnit_Framework_TestCase
{
public function testSaveHandlers()
{
@@ -24,7 +24,7 @@ public function testSaveHandlers()
// test takes too long if memcached server is not running
ini_set('memcached.sess_locking', '0');
- $storage = new NativeMemcachedSessionStorage('127.0.0.1:11211', array('name' => 'TESTING'));
+ $storage = new NativeMemcachedStorage('127.0.0.1:11211', array('name' => 'TESTING'));
$this->assertEquals('memcached', ini_get('session.save_handler'));
$this->assertEquals('127.0.0.1:11211', ini_get('session.save_path'));
View
8 ...torage/NativeSqliteSessionStorageTest.php → ...ssion/Storage/NativeSqliteStorageTest.php
@@ -2,26 +2,26 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteStorage;
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
/**
- * Test class for NativeSqliteSessionStorage.
+ * Test class for NativeSqliteStorage.
*
* @author Drak <drak@zikula.org>
*
* @runTestsInSeparateProcesses
*/
-class NativeSqliteSessionStorageTest extends \PHPUnit_Framework_TestCase
+class NativeSqliteStorageTest extends \PHPUnit_Framework_TestCase
{
public function testSaveHandlers()
{
if (!extension_loaded('sqlite')) {
$this->markTestSkipped('Skipped tests SQLite extension is not present');
}
- $storage = new NativeSqliteSessionStorage(sys_get_temp_dir().'/sqlite.db', array('name' => 'TESTING'));
+ $storage = new NativeSqliteStorage(sys_get_temp_dir().'/sqlite.db', array('name' => 'TESTING'));
$this->assertEquals('sqlite', ini_get('session.save_handler'));
$this->assertEquals(sys_get_temp_dir().'/sqlite.db', ini_get('session.save_path'));
$this->assertEquals('TESTING', ini_get('session.name'));
View
12 ...ession/Storage/NullSessionStorageTest.php → ...ation/Session/Storage/NullStorageTest.php
@@ -1,28 +1,28 @@
<?php
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
-use Symfony\Component\HttpFoundation\Session\Storage\NullSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\NullStorage;
use Symfony\Component\HttpFoundation\Session\Session;
/**
- * Test class for NullSessionStorage.
+ * Test class for NullStorage.
*
* @author Drak <drak@zikula.org>
*
* @runTestsInSeparateProcesses
*/
-class NullSessionStorageTest extends \PHPUnit_Framework_TestCase
+class NullStorageTest extends \PHPUnit_Framework_TestCase
{
public function testSaveHandlers()
{
- $storage = new NullSessionStorage();
+ $storage = new NullStorage();
$this->assertEquals('user', ini_get('session.save_handler'));
}
public function testSession()
{
session_id('nullsessionstorage');
- $storage = new NullSessionStorage();
+ $storage = new NullStorage();
$session = new Session($storage);
$this->assertNull($session->get('something'));
$session->set('something', 'unique');
@@ -32,7 +32,7 @@ public function testSession()
public function testNothingIsPersisted()
{
session_id('nullsessionstorage');
- $storage = new NullSessionStorage();
+ $storage = new NullStorage();
$session = new Session($storage);
$session->start();
$this->assertEquals('nullsessionstorage', $session->getId());
View
4 tests/Symfony/Tests/Component/Security/Http/Firewall/ContextListenerTest.php
@@ -5,7 +5,7 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -63,7 +63,7 @@ public function testOnKernelResponseWillRemoveSession()
protected function runSessionOnKernelResponse($newToken, $original = null)
{
- $session = new Session(new MockArraySessionStorage());
+ $session = new Session(new MockArrayStorage());
if ($original !== null) {
$session->set('_security_session', $original);

0 comments on commit 5b7ef11

Please sign in to comment.