diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md index 53fa9ac088..bcf7a4a4f1 100644 --- a/CHANGELOG-2.1.md +++ b/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 diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md index 78169aacdf..8cccf48f00 100644 --- a/UPGRADE-2.1.md +++ b/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` diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php index cda9dd2a0a..8595138dfc 100644 --- a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorage.php +++ b/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 @@ use Doctrine\DBAL\Driver\Connection; * @author Fabien Potencier * @author Johannes M. Schmitt */ -class DbalSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface +class DbalStorage extends AbstractStorage implements SessionSaveHandlerInterface { /** * @var Connection diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionStorageSchema.php index b33862588c..016f4e7a99 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 DbalSessionStorageSchema extends Schema +final class DbalStorageSchema extends Schema { private $tableName; diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 426e78cf5e..fd67ff74aa 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -301,7 +301,7 @@ class FrameworkExtension extends Extension $this->addClassesToCompile(array( 'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener', - 'Symfony\\Component\\HttpFoundation\\Session\Storage\\SessionStorageInterface', + 'Symfony\\Component\\HttpFoundation\\Session\Storage\\StorageInterface', $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 7e651594ec..b4808f9a72 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\FlashBag Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag - 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 + 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 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 b9f6e41670..823d949091 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\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 @@ class SessionHelperTest extends \PHPUnit_Framework_TestCase { $this->request = new Request(); - $session = new Session(new MockArraySessionStorage()); + $session = new Session(new MockArrayStorage()); $session->set('foobar', 'bar'); $session->getFlashes()->set(FlashBag::NOTICE, 'bar'); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php index 476b398e61..1917f50a2c 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\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 @@ class PhpEngineTest extends TestCase { $container = new Container(); $request = new Request(); - $session = new Session(new MockArraySessionStorage()); + $session = new Session(new MockArrayStorage()); $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 f15ef3f945..71e2ce518e 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\MockArraySessionStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; 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 MockArraySessionStorage()); + $session = new Session(new MockArrayStorage()); $request->setSession($session); $container->set('request', $request); diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 759bd45029..f4444b4db9 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 -> getMysqlSessionStorageService()
    • - *
  • symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()
    • + *
  • mysql_session_storage -> getMysqlStorageService()
    • + *
  • symfony.mysql_session_storage -> getSymfony_MysqlStorageService()
    • *
* * 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 51cd368931..23526bd544 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\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 @@ class Session implements SessionInterface /** * Implements the \Serialize interface. * - * @return SessionStorageInterface + * @return StorageInterface */ 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 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; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php similarity index 98% rename from src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php index d50462eb87..40b066c70e 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/AbstractStorage.php @@ -22,7 +22,7 @@ use Symfony\Component\HttpFoundation\Session\SessionBagInterface; * * @author Drak */ -abstract class AbstractSessionStorage implements SessionStorageInterface +abstract class AbstractStorage implements StorageInterface { /** * Array of SessionBagInterface @@ -297,7 +297,7 @@ abstract class AbstractSessionStorage implements SessionStorageInterface { // 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'), diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php similarity index 95% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php index f5d5910d86..39c15f57df 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheStorage.php @@ -12,11 +12,11 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * MemcacheSessionStorage. + * MemcacheStorage. * * @author Drak */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php similarity index 95% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php index f7041811a3..114a41e33d 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MemcachedStorage.php @@ -12,11 +12,11 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * MemcachedSessionStorage. + * MemcachedStorage. * * @author Drak */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArrayStorage.php similarity index 92% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MockArrayStorage.php index 2fd1a94c26..c762c8c396 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/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 * @author Bulat Shakirzyanov * @author Drak */ -class MockArraySessionStorage extends AbstractSessionStorage +class MockArrayStorage extends AbstractStorage { /** * @var string diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php similarity index 94% rename from src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php index 094c4d6005..314bf8e5b2 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileStorage.php @@ -12,7 +12,7 @@ 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 @@ -20,7 +20,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; * * @author Drak */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileStorage.php similarity index 89% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileStorage.php index 09350e8d21..da0a24086e 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeFileSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/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 */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheStorage.php similarity index 93% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheStorage.php index 5572c47812..91871ea848 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/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 */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedStorage.php similarity index 92% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedStorage.php index 50d8d060fd..f074e93ce1 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/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 */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteStorage.php similarity index 88% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteStorage.php index 1dac36ac2f..125d5f22e4 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/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 */ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NullStorage.php similarity index 90% rename from src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/NullStorage.php index b81fa8ae3a..bebedc53b6 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NullSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NullStorage.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * NullSessionStorage. + * NullStorage. * * 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 NullSessionStorage extends AbstractSessionStorage implements SessionSaveHandlerInterface +class NullStorage extends AbstractStorage implements SaveHandlerInterface { /** * {@inheritdoc} diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PdoSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PdoStorage.php similarity index 97% rename from src/Symfony/Component/HttpFoundation/Session/Storage/PdoSessionStorage.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/PdoStorage.php index 2015396b2f..a70152febf 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/PdoSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PdoStorage.php @@ -12,12 +12,12 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; /** - * PdoSessionStorage. + * PdoStorage. * * @author Fabien Potencier * @author Michael Williams */ -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; diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionSaveHandlerInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SaveHandlerInterface.php similarity index 99% rename from src/Symfony/Component/HttpFoundation/Session/Storage/SessionSaveHandlerInterface.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/SaveHandlerInterface.php index ec4530a150..0bc74ed8bb 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionSaveHandlerInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/SaveHandlerInterface.php @@ -52,7 +52,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage; * * @author Drak */ -interface SessionSaveHandlerInterface +interface SaveHandlerInterface { /** * Open session. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/StorageInterface.php similarity index 98% rename from src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php rename to src/Symfony/Component/HttpFoundation/Session/Storage/StorageInterface.php index a5afda9672..171dadc0bf 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/StorageInterface.php @@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Session\SessionBagInterface; * * @api */ -interface SessionStorageInterface +interface StorageInterface { /** * Starts the session. diff --git a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php index c147070fdf..89de12e988 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\MockArraySessionStorage; +use Symfony\Component\HttpFoundation\Session\Storage\MockArrayStorage; 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 MockArraySessionStorage())); + $request->setSession(new Session(new MockArrayStorage())); $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 MockArraySessionStorage())); + $request->setSession(new Session(new MockArrayStorage())); $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 71f2ec56cb..1b1cbd622c 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/SessionTest.php @@ -16,7 +16,7 @@ use Symfony\Component\HttpFoundation\Session\Flash\FlashBag; 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 @@ use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; 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()); } diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractStorageTest.php similarity index 79% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractStorageTest.php index 05bc5fefb3..e31503fa3d 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/AbstractSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/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,7 +44,7 @@ class CustomHandlerSessionStorage extends AbstractSessionStorage implements Sess } /** - * Test class for AbstractSessionStorage. + * Test class for AbstractStorage. * * @author Drak * @@ -52,14 +52,14 @@ class CustomHandlerSessionStorage extends AbstractSessionStorage implements Sess * * @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 @@ class AbstractSessionStorageTest extends \PHPUnit_Framework_TestCase 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')); } } diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArraySessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArrayStorageTest.php similarity index 89% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArraySessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArrayStorageTest.php index e2290f9459..33b43a4da2 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockArraySessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/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 */ -class MockArraySessionStorageTest extends \PHPUnit_Framework_TestCase +class MockArrayStorageTest extends \PHPUnit_Framework_TestCase { /** - * @var MockArraySessionStorage + * @var MockArrayStorage */ private $storage; @@ -41,7 +41,7 @@ class MockArraySessionStorageTest extends \PHPUnit_Framework_TestCase $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); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileStorageTest.php similarity index 91% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileStorageTest.php index 33a0d54844..3ccc139605 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/MockFileStorageTest.php @@ -2,16 +2,16 @@ 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 */ -class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase +class MockFileStorageTest extends \PHPUnit_Framework_TestCase { /** * @var string @@ -19,7 +19,7 @@ class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase private $sessionDir; /** - * @var FileMockSessionStorage + * @var FileMockStorage */ protected $storage; @@ -96,7 +96,7 @@ class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase 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); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileStorageTest.php similarity index 73% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileStorageTest.php index 2231c37fdd..f6f0ca6e91 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeFileSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/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 * * @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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheStorageTest.php similarity index 74% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheStorageTest.php index 23145e2d14..568955af77 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcacheStorageTest.php @@ -2,18 +2,18 @@ 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 * * @runTestsInSeparateProcesses */ -class NativeMemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase +class NativeMemcacheStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { @@ -21,7 +21,7 @@ class NativeMemcacheSessionStorageTest extends \PHPUnit_Framework_TestCase $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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedStorageTest.php similarity index 78% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedStorageTest.php index 7cb81ea811..9e9092eb9d 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeMemcachedSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/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 * * @runTestsInSeparateProcesses */ -class NativeMemcachedSessionStorageTest extends \PHPUnit_Framework_TestCase +class NativeMemcachedStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { @@ -24,7 +24,7 @@ class NativeMemcachedSessionStorageTest extends \PHPUnit_Framework_TestCase // 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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteStorageTest.php similarity index 75% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteStorageTest.php index 12a9b284a0..54dc6574ad 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSqliteStorageTest.php @@ -2,18 +2,18 @@ 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 * * @runTestsInSeparateProcesses */ -class NativeSqliteSessionStorageTest extends \PHPUnit_Framework_TestCase +class NativeSqliteStorageTest extends \PHPUnit_Framework_TestCase { public function testSaveHandlers() { @@ -21,7 +21,7 @@ class NativeSqliteSessionStorageTest extends \PHPUnit_Framework_TestCase $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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullStorageTest.php similarity index 74% rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullSessionStorageTest.php rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullStorageTest.php index 66599f68b3..9abd333d3c 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NullStorageTest.php @@ -1,28 +1,28 @@ * * @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 @@ class NullSessionStorageTest extends \PHPUnit_Framework_TestCase public function testNothingIsPersisted() { session_id('nullsessionstorage'); - $storage = new NullSessionStorage(); + $storage = new NullStorage(); $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 5c810062ef..bac4fa52e6 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\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 @@ class ContextListenerTest extends \PHPUnit_Framework_TestCase protected function runSessionOnKernelResponse($newToken, $original = null) { - $session = new Session(new MockArraySessionStorage()); + $session = new Session(new MockArrayStorage()); if ($original !== null) { $session->set('_security_session', $original);