diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md index b08ac98781..a78edf4a0d 100644 --- a/CHANGELOG-2.1.md +++ b/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 diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md index 641c967c96..2df9529737 100644 --- a/UPGRADE-2.1.md +++ b/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` diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php index 5d2c5d4d1a..cda9dd2a0a 100644 --- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php +++ b/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 @@ use Doctrine\DBAL\Driver\Connection; * @author Fabien Potencier * @author Johannes M. Schmitt */ -class DbalStorage extends AbstractStorage implements SaveHandlerInterface +class DbalSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface { /** * @var Connection diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php index 016f4e7a99..b33862588c 100644 --- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php +++ b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php @@ -9,7 +9,7 @@ use Doctrine\DBAL\Schema\Schema; * * @author Johannes M. Schmitt */ -final class DbalStorageSchema extends Schema +final class DbalSessionStorageSchema extends Schema { private $tableName; diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index fd67ff74aa..426e78cf5e 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\\StorageInterface', + '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 e0c5a7d816..845bd2b501 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml @@ -8,14 +8,14 @@ Symfony\Component\HttpFoundation\Session\Session Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag - Symfony\Component\HttpFoundation\Session\Storage\NativeFileStorage - Symfony\Component\HttpFoundation\Session\Storage\NullStorage - Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheStorage - Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedStorage - Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteStorage - Symfony\Component\HttpFoundation\Session\Storage\MemcacheStorage - Symfony\Component\HttpFoundation\Session\Storage\MemcachedStorage - Symfony\Component\HttpFoundation\Session\Storage\MockFileStorage + Symfony\Component\HttpFoundation\Session\Storage\NativeFileSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\NullSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\MemcacheSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\MemcachedSessionStorage + Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage Memcache Memcached diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php index 9ba8496d92..8f87603a6c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/SessionHelperTest.php @@ -13,7 +13,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Templating\Helper; 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 @@ class SessionHelperTest extends \PHPUnit_Framework_TestCase { $this->request = new Request(); - $session = new Session(new MockArrayStorage()); + $session = new Session(new MockArraySessionStorage()); $session->set('foobar', 'bar'); $session->getFlashes()->set('notice', 'bar'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php index 1917f50a2c..476b398e61 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php @@ -15,7 +15,7 @@ use Symfony\Bundle\FrameworkBundle\Templating\PhpEngine; 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 @@ class PhpEngineTest extends TestCase { $container = new Container(); $request = new Request(); - $session = new Session(new MockArrayStorage()); + $session = new Session(new MockArraySessionStorage()); $request->setSession($session); $container->set('request', $request); diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php index 71e2ce518e..f15ef3f945 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php @@ -15,7 +15,7 @@ use Symfony\Bundle\TwigBundle\TwigEngine; 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 @@ class TwigEngineTest extends TestCase { $container = new Container(); $request = new Request(); - $session = new Session(new MockArrayStorage()); + $session = new Session(new MockArraySessionStorage()); $request->setSession($session); $container->set('request', $request); diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index f4444b4db9..759bd45029 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -43,8 +43,8 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag; * *
    *
  • request -> getRequestService()
    • - *
  • mysql_session_storage -> getMysqlStorageService()
    • - *
  • symfony.mysql_session_storage -> getSymfony_MysqlStorageService()
    • + *
  • mysql_session_storage -> getMysqlSessionStorageService()
    • + *
  • symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()
    • *
* * The container can have three possible behaviors when a service does not exist: diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php index 23526bd544..51cd368931 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Session.php +++ b/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 @@ class Session implements SessionInterface /** * Implements the \Serialize interface. * - * @return StorageInterface + * @return SessionStorageInterface */ public function serialize() { @@ -214,13 +214,13 @@ class Session implements SessionInterface /** * 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; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php similarity index 98% rename from src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php index 1b17939c59..c703d09a00 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php @@ -18,7 +18,7 @@ use Symfony\Component\HttpFoundation\Session\SessionBagInterface; * * @author Drak */ -abstract class AbstractStorage implements StorageInterface +abstract class AbstractSessionStorage implements SessionStorageInterface { /** * Array of SessionBagInterface @@ -293,7 +293,7 @@ abstract class AbstractStorage implements StorageInterface { // 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'), diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php similarity index 95% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php index 39c15f57df..f5d5910d86 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php @@ -12,11 +12,11 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * MemcacheStorage. + * MemcacheSessionStorage. * * @author Drak */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php similarity index 95% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php index 114a41e33d..f7041811a3 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php @@ -12,11 +12,11 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * MemcachedStorage. + * MemcachedSessionStorage. * * @author Drak */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArrayStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php similarity index 92% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MockArrayStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php index c762c8c396..2fd1a94c26 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArrayStorage.php +++ b/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 * @author Bulat Shakirzyanov * @author Drak */ -class MockArrayStorage extends AbstractStorage +class MockArraySessionStorage extends AbstractSessionStorage { /** * @var string diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php similarity index 94% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php index 314bf8e5b2..094c4d6005 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php @@ -12,7 +12,7 @@ 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 @@ -20,7 +20,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; * * @author Drak */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php similarity index 89% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php index da0a24086e..09350e8d21 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileStorage.php +++ b/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 */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php similarity index 93% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php index 91871ea848..5572c47812 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheStorage.php +++ b/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 */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php similarity index 92% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php index f074e93ce1..50d8d060fd 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php @@ -12,13 +12,13 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * NativeMemcachedStorage. + * NativeMemcachedSessionStorage. * * Session based on native PHP memcached database handler. * * @author Drak */ -class NativeMemcachedStorage extends AbstractStorage +class NativeMemcachedSessionStorage extends AbstractSessionStorage { /** * @var string @@ -31,7 +31,7 @@ class NativeMemcachedStorage extends AbstractStorage * @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 AbstractStorage::__construct() + * @see AbstractSessionStorage::__construct() */ public function __construct($savePath = '127.0.0.1:11211', array $options = array()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php similarity index 88% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php index 125d5f22e4..1dac36ac2f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php @@ -12,13 +12,13 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * NativeSqliteStorage. + * NativeSqliteSessionStorage. * * Session based on native PHP sqlite database handler. * * @author Drak */ -class NativeSqliteStorage extends AbstractStorage +class NativeSqliteSessionStorage extends AbstractSessionStorage { /** * @var string @@ -31,7 +31,7 @@ class NativeSqliteStorage extends AbstractStorage * @param string $dbPath Path to SQLite database file. * @param array $options Session configuration options. * - * @see AbstractStorage::__construct() + * @see AbstractSessionStorage::__construct() */ public function __construct($dbPath, array $options = array()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NullStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php similarity index 90% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NullStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php index bebedc53b6..b81fa8ae3a 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NullStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * NullStorage. + * NullSessionStorage. * * Can be used in unit testing or in a sitation where persisted sessions are not desired. * @@ -20,7 +20,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; * * @api */ -class NullStorage extends AbstractStorage implements SaveHandlerInterface +class NullSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface { /** * {@inheritdoc} diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PdoStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PdoSessionStorage.php similarity index 97% rename from src/Symfony/Component/HttpFoundation/Session/Storage/PdoStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/PdoSessionStorage.php index a70152febf..2015396b2f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/PdoStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PdoSessionStorage.php @@ -12,12 +12,12 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * PdoStorage. + * PdoSessionStorage. * * @author Fabien Potencier * @author Michael Williams */ -class PdoStorage extends AbstractStorage implements SaveHandlerInterface +class PdoSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface { /** * PDO instance. @@ -44,12 +44,12 @@ class PdoStorage extends AbstractStorage implements SaveHandlerInterface * * @throws \InvalidArgumentException When "db_table" option is not provided * - * @see AbstractStorage::__construct() + * @see AbstractSessionStorage::__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 PdoStorage.'); + throw new \InvalidArgumentException('You must provide the "db_table" option for a PdoSessionStorage.'); } $this->pdo = $pdo; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SaveHandlerInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionSaveHandlerInterface.php similarity index 99% rename from src/Symfony/Component/HttpFoundation/Session/Storage/SaveHandlerInterface.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/SessionSaveHandlerInterface.php index 0bc74ed8bb..ec4530a150 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/SaveHandlerInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionSaveHandlerInterface.php @@ -52,7 +52,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; * * @author Drak */ -interface SaveHandlerInterface +interface SessionSaveHandlerInterface { /** * Open session. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/StorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php similarity index 98% rename from src/Symfony/Component/HttpFoundation/Session/Storage/StorageInterface.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php index 171dadc0bf..a5afda9672 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/StorageInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php @@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Session\SessionBagInterface; * * @api */ -interface StorageInterface +interface SessionStorageInterface { /** * Starts the session. diff --git a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php index 89de12e988..c147070fdf 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php @@ -12,7 +12,7 @@ namespace Symfony\Tests\Component\HttpFoundation; -use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Request; @@ -846,7 +846,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase $request = new Request; $this->assertFalse($request->hasSession()); - $request->setSession(new Session(new MockArrayStorage())); + $request->setSession(new Session(new MockArraySessionStorage())); $this->assertTrue($request->hasSession()); } @@ -857,7 +857,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase $this->assertFalse($request->hasPreviousSession()); $request->cookies->set(session_name(), 'foo'); $this->assertFalse($request->hasPreviousSession()); - $request->setSession(new Session(new MockArrayStorage())); + $request->setSession(new Session(new MockArraySessionStorage())); $this->assertTrue($request->hasPreviousSession()); } diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php index 4499fce137..3f57670581 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php @@ -14,7 +14,7 @@ namespace Symfony\Tests\Component\HttpFoundation\Session; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Flash\FlashBag; use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; -use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; /** * SessionTest @@ -26,7 +26,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; class SessionTest extends \PHPUnit_Framework_TestCase { /** - * @var \Symfony\Component\HttpFoundation\Session\Storage\StorageInterface + * @var \Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface */ protected $storage; @@ -37,7 +37,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase public function setUp() { - $this->storage = new MockArrayStorage(); + $this->storage = new MockArraySessionStorage(); $this->session = new Session($this->storage, new AttributeBag(), new FlashBag()); } diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php similarity index 79% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php index e31503fa3d..05bc5fefb3 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php @@ -2,21 +2,21 @@ namespace Symfony\Tests\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\AbstractStorage; +use Symfony\Component\HttpFoundation\Session\Storage\AbstractSessionStorage; use Symfony\Component\HttpFoundation\Session\Flash\FlashBag; use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; -use Symfony\Component\HttpFoundation\Session\Storage\SaveHandlerInterface; +use Symfony\Component\HttpFoundation\Session\Storage\SessionSaveHandlerInterface; /** - * Turn AbstractStorage into something concrete because + * Turn AbstractSessionStorage 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 ConcreteStorage extends AbstractStorage +class ConcreteSessionStorage extends AbstractSessionStorage { } -class CustomHandlerStorage extends AbstractStorage implements SaveHandlerInterface +class CustomHandlerSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface { public function openSession($path, $id) { @@ -44,7 +44,7 @@ class CustomHandlerStorage extends AbstractStorage implements SaveHandlerInterfa } /** - * Test class for AbstractStorage. + * Test class for AbstractSessionStorage. * * @author Drak * @@ -52,14 +52,14 @@ class CustomHandlerStorage extends AbstractStorage implements SaveHandlerInterfa * * @runTestsInSeparateProcesses */ -class AbstractStorageTest extends \PHPUnit_Framework_TestCase +class AbstractSessionStorageTest extends \PHPUnit_Framework_TestCase { /** - * @return AbstractStorage + * @return AbstractSessionStorage */ protected function getStorage() { - $storage = new CustomHandlerStorage(); + $storage = new CustomHandlerSessionStorage(); $storage->registerBag(new AttributeBag); return $storage; @@ -115,13 +115,13 @@ class AbstractStorageTest extends \PHPUnit_Framework_TestCase public function testCustomSaveHandlers() { - $storage = new CustomHandlerStorage(); + $storage = new CustomHandlerSessionStorage(); $this->assertEquals('user', ini_get('session.save_handler')); } public function testNativeSaveHandlers() { - $storage = new ConcreteStorage(); + $storage = new ConcreteSessionStorage(); $this->assertNotEquals('user', ini_get('session.save_handler')); } } diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArrayStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArraySessionStorageTest.php similarity index 89% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArrayStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArraySessionStorageTest.php index 29d9078532..4611457940 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArrayStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArraySessionStorageTest.php @@ -2,20 +2,20 @@ namespace Symfony\Tests\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; use Symfony\Component\HttpFoundation\Session\Flash\FlashBag; /** - * Test class for MockArrayStorage. + * Test class for MockArraySessionStorage. * * @author Drak */ -class MockArrayStorageTest extends \PHPUnit_Framework_TestCase +class MockArraySessionStorageTest extends \PHPUnit_Framework_TestCase { /** - * @var MockArrayStorage + * @var MockArraySessionStorage */ private $storage; @@ -41,7 +41,7 @@ class MockArrayStorageTest extends \PHPUnit_Framework_TestCase $this->flashes->getStorageKey() => array('notice' => 'hello'), ); - $this->storage = new MockArrayStorage(); + $this->storage = new MockArraySessionStorage(); $this->storage->registerBag($this->flashes); $this->storage->registerBag($this->attributes); $this->storage->setSessionData($this->data); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileSessionStorageTest.php similarity index 91% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileSessionStorageTest.php index 337faf4ca0..770bcda8f0 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileSessionStorageTest.php @@ -2,16 +2,16 @@ namespace Symfony\Test\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\MockFileStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage; use Symfony\Component\HttpFoundation\Session\Flash\FlashBag; use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; /** - * Test class for MockFileStorage. + * Test class for MockFileSessionStorage. * * @author Drak */ -class MockFileStorageTest extends \PHPUnit_Framework_TestCase +class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase { /** * @var string @@ -19,7 +19,7 @@ class MockFileStorageTest extends \PHPUnit_Framework_TestCase private $sessionDir; /** - * @var FileMockStorage + * @var FileMockSessionStorage */ protected $storage; @@ -96,7 +96,7 @@ class MockFileStorageTest extends \PHPUnit_Framework_TestCase private function getStorage(array $options = array()) { - $storage = new MockFileStorage($this->sessionDir, $options); + $storage = new MockFileSessionStorage($this->sessionDir, $options); $storage->registerBag(new FlashBag); $storage->registerBag(new AttributeBag); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php similarity index 68% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php index e44ae44170..df3ef95cbf 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php @@ -2,20 +2,20 @@ namespace Symfony\Tests\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\NativeFileStorage; +use Symfony\Component\HttpFoundation\Session\Storage\NativeFileSessionStorage; /** - * Test class for NativeFileStorage. + * Test class for NativeFileSessionStorage. * * @author Drak * * @runTestsInSeparateProcesses */ -class NativeFileStorageTest extends \PHPUnit_Framework_TestCase +class NativeFileSessionStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { - $storage = new NativeFileStorage(sys_get_temp_dir(), array('name' => 'TESTING')); + $storage = new NativeFileSessionStorage(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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php similarity index 71% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php index 18a0276001..4274ed5bd1 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php @@ -2,16 +2,16 @@ namespace Symfony\Tests\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheStorage; +use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcacheSessionStorage; /** - * Test class for NativeMemcacheStorage. + * Test class for NativeMemcacheSessionStorage. * * @author Drak * * @runTestsInSeparateProcesses */ -class NativeMemcacheStorageTest extends \PHPUnit_Framework_TestCase +class NativeMemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { @@ -19,7 +19,7 @@ class NativeMemcacheStorageTest extends \PHPUnit_Framework_TestCase $this->markTestSkipped('Skipped tests SQLite extension is not present'); } - $storage = new NativeMemcacheStorage('tcp://127.0.0.1:11211?persistent=0', array('name' => 'TESTING')); + $storage = new NativeMemcacheSessionStorage('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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php similarity index 75% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php index 4cc691df72..c0a12aa2b4 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php @@ -2,16 +2,16 @@ namespace Symfony\Tests\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedStorage; +use Symfony\Component\HttpFoundation\Session\Storage\NativeMemcachedSessionStorage; /** - * Test class for NativeMemcachedStorage. + * Test class for NativeMemcachedSessionStorage. * * @author Drak * * @runTestsInSeparateProcesses */ -class NativeMemcachedStorageTest extends \PHPUnit_Framework_TestCase +class NativeMemcachedSessionStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { @@ -22,7 +22,7 @@ class NativeMemcachedStorageTest extends \PHPUnit_Framework_TestCase // test takes too long if memcached server is not running ini_set('memcached.sess_locking', '0'); - $storage = new NativeMemcachedStorage('127.0.0.1:11211', array('name' => 'TESTING')); + $storage = new NativeMemcachedSessionStorage('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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php similarity index 72% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php index c8a7cacbe3..b1700326b1 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php @@ -2,16 +2,16 @@ namespace Symfony\Tests\Component\HttpFoundation\Session\Storage; -use Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteStorage; +use Symfony\Component\HttpFoundation\Session\Storage\NativeSqliteSessionStorage; /** - * Test class for NativeSqliteStorage. + * Test class for NativeSqliteSessionStorage. * * @author Drak * * @runTestsInSeparateProcesses */ -class NativeSqliteStorageTest extends \PHPUnit_Framework_TestCase +class NativeSqliteSessionStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { @@ -19,7 +19,7 @@ class NativeSqliteStorageTest extends \PHPUnit_Framework_TestCase $this->markTestSkipped('Skipped tests SQLite extension is not present'); } - $storage = new NativeSqliteStorage(sys_get_temp_dir().'/sqlite.db', array('name' => 'TESTING')); + $storage = new NativeSqliteSessionStorage(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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullSessionStorageTest.php similarity index 74% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullSessionStorageTest.php index 9abd333d3c..66599f68b3 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullSessionStorageTest.php @@ -1,28 +1,28 @@ * * @runTestsInSeparateProcesses */ -class NullStorageTest extends \PHPUnit_Framework_TestCase +class NullSessionStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { - $storage = new NullStorage(); + $storage = new NullSessionStorage(); $this->assertEquals('user', ini_get('session.save_handler')); } public function testSession() { session_id('nullsessionstorage'); - $storage = new NullStorage(); + $storage = new NullSessionStorage(); $session = new Session($storage); $this->assertNull($session->get('something')); $session->set('something', 'unique'); @@ -32,7 +32,7 @@ class NullStorageTest extends \PHPUnit_Framework_TestCase public function testNothingIsPersisted() { session_id('nullsessionstorage'); - $storage = new NullStorage(); + $storage = new NullSessionStorage(); $session = new Session($storage); $session->start(); $this->assertEquals('nullsessionstorage', $session->getId()); diff --git a/tests/Symfony/Tests/Component/Security/Http/Firewall/ContextListenerTest.php b/tests/Symfony/Tests/Component/Security/Http/Firewall/ContextListenerTest.php index bac4fa52e6..5c810062ef 100644 --- a/tests/Symfony/Tests/Component/Security/Http/Firewall/ContextListenerTest.php +++ b/tests/Symfony/Tests/Component/Security/Http/Firewall/ContextListenerTest.php @@ -5,7 +5,7 @@ namespace Symfony\Test\Component\Security\Http\Firewall; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Session\Session; -use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; @@ -63,7 +63,7 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase protected function runSessionOnKernelResponse($newToken, $original = null) { - $session = new Session(new MockArrayStorage()); + $session = new Session(new MockArraySessionStorage()); if ($original !== null) { $session->set('_security_session', $original);