8000 [HttpFoundation] documentation fix by pulzarraider · Pull Request #3627 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpFoundation] documentation fix #3627

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 1 commit into from
Mar 17, 2012
Merged

[HttpFoundation] documentation fix #3627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* MemcacheSessionStorage.
* MemcacheSessionHandler.
*
* @author Drak <drak@zikula.org>
*/
Expand Down Expand Up @@ -45,8 +45,6 @@ class MemcacheSessionHandler implements \SessionHandlerInterface
* @param \Memcache $memcache A \Memcache instance
* @param array $memcacheOptions An associative array of Memcache options
* @param array $options Session configuration options.
*
* @see AbstractSessionStorage::__construct()
*/
public function __construct(\Memcache $memcache, array $memcacheOptions = array(), array $options = array())
{
Expand Down
4 changes: 1 addition & 3 deletions src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* MemcachedSessionStorage.
* MemcachedSessionHandler.
*
* Memcached based session storage handler based on the Memcached class
* provided by the PHP memcached extension.
Expand Down Expand Up @@ -43,8 +43,6 @@ class MemcachedSessionHandler implements \SessionHandlerInterface
* @param \Memcached $memcached A \Memcached instance
* @param array $memcachedOptions An associative array of Memcached options
* @param array $options Session configuration options.
*
* @see AbstractSessionStorage::__construct()
*/
public function __construct(\Memcached $memcached, array $memcachedOptions = array(), array $options = array())
{
Expand Down
8 changes: 2 additions & 6 deletions ...Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* NativeMemcacheSessionStorage.
* NativeMemcacheSessionHandler.
*
* Driver for the memcache session save hadlers provided by the memcache PHP extension.
*
Expand All @@ -27,8 +27,6 @@ class NativeMemcacheSessionHandler extends NativeSessionHandler
*
* @param string $savePath Path of memcache server.
* @param array $options Session configuration options.
*
* @see AbstractSessionStorage::__construct()
*/
public function __construct($savePath = 'tcp://127.0.0.1:11211?persistent=0', array $options = array())
{
Expand All @@ -47,9 +45,7 @@ public function __construct($savePath = 'tcp://127.0.0.1:11211?persistent=0', ar
}

/**
* {@inheritdoc}
*
* Sets any values memcached ini values.
* Set any memcached ini values.
*
* @see http://php.net/memcache.ini
*/
Expand Down
8 changes: 2 additions & 6 deletions ...ymfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* NativeMemcachedSessionStorage.
* NativeMemcachedSessionHandler.
*
* Driver for the memcached session save hadlers provided by the memcached PHP extension.
*
Expand All @@ -27,8 +27,6 @@ class NativeMemcachedSessionHandler extends NativeSessionHandler
*
* @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()
*/
public function __construct($savePath = '127.0.0.1:11211', array $options = array())
{
Expand All @@ -47,9 +45,7 @@ public function __construct($savePath = '127.0.0.1:11211', array $options = arra
}

/**
* {@inheritdoc}
*
* Sets any values memcached ini values.
* Set any memcached ini values.
*
* @see https://github.com/php-memcached-dev/php-memcached/blob/master/memcached.ini
*/
Expand Down
8 changes: 2 additions & 6 deletions src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* NativeSqliteSessionStorage.
* NativeSqliteSessionHandler.
*
* Driver for the sqlite session save hadlers provided by the SQLite PHP extension.
*
Expand All @@ -25,8 +25,6 @@ class NativeSqliteSessionHandler extends NativeSessionHandler
*
* @param string $savePath Path to SQLite database file itself.
* @param array $options Session configuration options.
*
* @see AbstractSessionStorage::__construct()
*/
public function __construct($savePath, array $options = array())
{
Expand All @@ -45,9 +43,7 @@ public function __construct($savePath, array $options = array())
}

/**
* {@inheritdoc}
*
* Sets any values sqlite ini values.
* Set any sqlite ini values.
*
* @see http://php.net/sqlite.configuration
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* NullSessionStorage.
* NullSessionHandler.
*
* Can be used in unit testing or in a sitation where persisted sessions are not desired.
*
Expand Down
5 changes: 1 addition & 4 deletions src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;

/**
* PdoSessionStorage.
* PdoSessionHandler.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Michael Williams <michael.williams@funsational.com>
Expand All @@ -37,14 +37,11 @@ class PdoSessionHandler implements \SessionHandlerInterface
/**
* Constructor.
*
*
* @param \PDO $pdo A \PDO instance
* @param array $dbOptions An associative array of DB options
* @param array $options Session configuration options
*
* @throws \InvalidArgumentException When "db_table" option is not provided
*
* @see AbstractSessionStorage::__construct()
*/
public function __construct(\PDO $pdo, array $dbOptions = array(), array $options = array())
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler;

/**
* Test class for DbalSessionStorage.
* Test class for DbalSessionHandler.
*
* @author Drak <drak@zikula.org>
*/
Expand Down
2 changes: 1 addition & 1 deletion ...ony/Tests/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class MemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
{
/**
* @var MemcacheSessionStorage
* @var MemcacheSessionHandler
*/
protected $storage;

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -17,7 +17,7 @@ class NativeMemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
public function testSaveHandlers()
{
if (!extension_loaded('memcache')) {
$this->markTestSkipped('Skipped tests SQLite extension is not present');
$this->markTestSkipped('Skipped tests memcache extension is not present');
}

$storage = new NativeSessionStorage(array('name' => 'TESTING'), new NativeMemcacheSessionHandler('tcp://127.0.0.1:11211?persistent=0'));
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -17,7 +17,7 @@ class NativeMemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase
public function testSaveHandlers()
{
if (!extension_loaded('memcached')) {
$this->markTestSkipped('Skipped tests SQLite extension is not present');
$this->markTestSkipped('Skipped tests memcached extension is not present');
}

// test takes too long if memcached server is not running
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -6,7 +6,7 @@
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;

/**
* Test class for NativeSqliteSessionStorage.
* Test class for NativeSqliteSessionHandler.
*
* @author Drak <drak@zikula.org>
*
Expand Down
2 changes: 1 addition & 1 deletion tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSessionStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;

/**
* Test class for AbstractSessionStorage.
* Test class for NativeSessionStorage.
*
* @author Drak <drak@zikula.org>
*
Expand Down
0