8000 [2.1] Support PHP 5.4 \SessionHandler · Pull Request #3493 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[2.1] Support PHP 5.4 \SessionHandler #3493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from Mar 15, 2012
Merged

[2.1] Support PHP 5.4 \SessionHandler #3493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bb30a44
[HttpFoundation] Prepare to split out session handler callback from s…
Mar 3, 2012
2326707
[HttpFoundation] Split session handler callbacks to separate object.
Mar 3, 2012
0a064d8
[HttpFoundation] Refactor session handlers.
Mar 3, 2012
2257a3d
[HttpFoundation] Move session handler classes.
Mar 3, 2012
88b1170
[HttpFoundation] Refactor tests.
Mar 3, 2012
1308312
[HttpFoundation] Add and relocate tests.
Mar 3, 2012
a1c678e
[FrameworkBundle] Add session.handler service and handler_id configur…
Mar 3, 2012
a6a9280
[DoctrineBridge] Refactor session storage to handler.
Mar 4, 2012
cb873b2
[HttpFoundation] Add tests and some CS/docblocks.
Mar 4, 2012
21221f7
[FrameworkBundle] Make use of session API.
Mar 6, 2012
39526df
[HttpFoundation] Refactor away options property.
Mar 8, 2012
7b36d0c
[DoctrineBridge][HttpFoundation] Refactored tests.
Mar 9, 2012
d687801
[HttpKernel] Mock must invoke constructor.
Mar 14, 2012
b12ece0
[HttpFoundation][FrameworkBundle] Separate out mock session storage a…
Mar 14, 2012
7f33b33
Refactor SessionStorage to NativeSessionStorage.
Mar 14, 2012
68074a2
Changelog and upgrading changes.
Mar 6, 2012
9a5fc65
[HttpFoundation] Add more tests.
Mar 14, 2012
eb9bf05
[HttpFoundation] Remove hard coded assumptions and replace with API c…
Mar 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor SessionStorage to NativeSessionStorage. 
Native here refers to the fact the session storage interacts with real PHP sessions.
  • Loading branch information
Drak committed Mar 14, 2012
commit 7f33b33aa6abcc1c1cdeb3aff3d9d368b2eef5e6
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
$this->addClassesToCompile(array(
'Symfony\\Bundle\\FrameworkBundle\\EventListener\\SessionListener',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorageInterface',
8000 'Symfony\\Component\\HttpFoundation\\Session\\Storage\\SessionStorage',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\NativeSessionStorage',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\NativeSessionHandler',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\AbstractProxy',
'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Proxy\SessionHandlerProxy',
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parameter key="session.class">Symfony\Component\HttpFoundation\Session\Session</parameter>
<parameter key="session.flashbag.class">Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag</parameter>
<parameter key="session.attribute_bag.class">Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag</parameter>
<parameter key="session.storage.native.class">Symfony\Component\HttpFoundation\Session\Storage\SessionStorage</parameter>
<parameter key="session.storage.native.class">Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage</parameter>
<parameter key="session.storage.mock_file.class">Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage</parameter>
<parameter key="session.handler.native_file.class">Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler</parameter>
<parameter key="session_listener.class">Symfony\Bundle\FrameworkBundle\EventListener\SessionListener</parameter>
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpFoundation/Session/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;

/**
* Session.
Expand Down Expand Up @@ -45,7 +45,7 @@ class Session implements SessionInterface
*/
public function __construct(SessionStorageInterface $storage = null, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null)
{
$this->storage = $storage ?: new SessionStorage();
$this->storage = $storage ?: new NativeSessionStorage();
$this->registerBag($attributes ?: new AttributeBag());
$this->registerBag($flashes ?: new FlashBag());
}
Expand Down
2 changes: 1 addition & 1 deletion ...dation/Session/Storage/SessionStorage.php → .../Session/Storage/NativeSessionStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*
* @author Drak <drak@zikula.org>
*/
class SessionStorage implements SessionStorageInterface
class NativeSessionStorage implements SessionStorageInterface
{
/**
* Array of SessionBagInterface
Expand Down
6 changes: 3 additions & 3 deletions ...y/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeFileSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;

use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;

/**
* Test class for NativeFileSessionHandler.
Expand All @@ -16,7 +16,7 @@ class NativeFileSessionHandlerTest extends \PHPUnit_Framework_TestCase
{
public function testConstruct()
{
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler(sys_get_temp_dir()));

if (version_compare(phpversion(), '5.4.0', '<')) {
$this->assertEquals('files', $storage->getSaveHandler()->getSaveHandlerName());
Expand All @@ -33,7 +33,7 @@ public function testConstruct()
public function testConstructDefault()
{
$path = ini_get('session.save_path');
$storage = new SessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler());
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeFileSessionHandler());

$this->assertEquals($path, ini_get('session.save_path'));
}
Expand Down
4 changes: 2 additions & 2 deletions ...sts/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;

use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeMemcacheSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;

/**
* Test class for NativeMemcacheSessionHandler.
Expand All @@ -20,7 +20,7 @@ public function testSaveHandlers()
$this->markTestSkipped('Skipped tests SQLite extension is not present');
}

$storage = new SessionStorage(array('name' => 'TESTING'), new NativeMemcacheSessionHandler('tcp://127.0.0.1:11211?persistent=0'));
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeMemcacheSessionHandler('tcp://127.0.0.1:11211?persistent=0'));

if (version_compare(phpversion(), '5.4.0', '<')) {
$this->assertEquals('memcache', $storage->getSaveHandler()->getSaveHandlerName());
Expand Down
4 changes: 2 additions & 2 deletions ...ts/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;

use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeMemcachedSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;

/**
* Test class for NativeMemcachedSessionHandler.
Expand All @@ -23,7 +23,7 @@ public function testSaveHandlers()
// test takes too long if memcached server is not running
ini_set('memcached.sess_locking', '0');

$storage = new SessionStorage(array('name' => 'TESTING'), new NativeMemcachedSessionHandler('127.0.0.1:11211'));
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeMemcachedSessionHandler('127.0.0.1:11211'));

if (version_compare(phpversion(), '5.4.0', '<')) {
$this->assertEquals('memcached', $storage->getSaveHandler()->getSaveHandlerName());
Expand Down
4 changes: 2 additions & 2 deletions ...Tests/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;

use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSqliteSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;

/**
* Test class for NativeSqliteSessionStorage.
Expand All @@ -20,7 +20,7 @@ public function testSaveHandlers()
$this->markTestSkipped('Skipped tests SQLite extension is not present');
}

$storage = new SessionStorage(array('name' => 'TESTING'), new NativeSqliteSessionHandler(sys_get_temp_dir().'/sqlite.db'));
$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeSqliteSessionHandler(sys_get_temp_dir().'/sqlite.db'));

if (version_compare(phpversion(), '5.4.0', '<')) {
$this->assertEquals('sqlite', $storage->getSaveHandler()->getSaveHandlerName());
Expand Down
4 changes: 2 additions & 2 deletions ...Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpFoundation\Session\Session;

/**
Expand Down Expand Up @@ -42,7 +42,7 @@ public function testNothingIsPersisted()

public function getStorage()
{
return new SessionStorage(array(), new NullSessionHandler());
return new NativeSessionStorage(array(), new NullSessionHandler());
}
}

12 changes: 6 additions & 6 deletions ...on/Session/Storage/SessionStorageTest.php → ...sion/Storage/NativeSessionStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;

use Symfony\Component\HttpFoundation\Session\Storage\SessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NullSessionHandler;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
Expand All @@ -17,14 +17,14 @@
*
* @runTestsInSeparateProcesses
*/
class SessionStorageTest extends \PHPUnit_Framework_TestCase
class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase
{
/**
* @return AbstractSessionStorage
* @return NativeSessionStorage
*/
protected function getStorage(array $options = array())
{
$storage = new SessionStorage($options);
$storage = new NativeSessionStorage($options);
$storage->registerBag(new AttributeBag);

return $storage;
Expand Down Expand Up @@ -82,15 +82,15 @@ public function testDefaultSessionCacheLimiter()
{
ini_set('session.cache_limiter', 'nocache');

$storage = new SessionStorage();
$storage = new NativeSessionStorage();
$this->assertEquals('', ini_get('session.cache_limiter'));
}

public function testExplicitSessionCacheLimiter()
{
ini_set('session.cache_limiter', 'nocache');

$storage = new SessionStorage(array('cache_limiter' => 'public'));
$storage = new NativeSessionStorage(array('cache_limiter' => 'public'));
$this->assertEquals('public', ini_get('session.cache_limiter'));
}

Expand Down
0