8000 merged branch pulzarraider/session_doc_fix (PR #3627) · symfony/symfony@3d84153 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3d84153

Browse files
fabpotfabpot
committed
merged branch pulzarraider/session_doc_fix (PR #3627)
Commits ------- f351cdc doc fix Discussion ---------- [HttpFoundation] documentation fix Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: -
2 parents 99406eb + f351cdc commit 3d84153

13 files changed

+16
-35
lines changed

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

1414
/**
15-
* MemcacheSessionStorage.
15+
* MemcacheSessionHandler.
1616
*
1717
* @author Drak <drak@zikula.org>
1818
*/
@@ -45,8 +45,6 @@ class MemcacheSessionHandler implements \SessionHandlerInterface
4545
* @param \Memcache $memcache A \Memcache instance
4646
* @param array $memcacheOptions An associative array of Memcache options
4747
* @param array $options Session configuration options.
48-
*
49-
* @see AbstractSessionStorage::__construct()
5048
*/
5149
public function __construct(\Memcache $memcache, array $memcacheOptions = array(), array $options = array())
5250
{

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

1414
/**
15-
* MemcachedSessionStorage.
15+
* MemcachedSessionHandler.
1616
*
1717
* Memcached based session storage handler based on the Memcached class
1818
* provided by the PHP memcached extension.
@@ -43,8 +43,6 @@ class MemcachedSessionHandler implements \SessionHandlerInterface
4343
* @param \Memcached $memcached A \Memcached instance
4444
* @param array $memcachedOptions An associative array of Memcached options
4545
* @param array $options Session configuration options.
46-
*
47-
* @see AbstractSessionStorage::__construct()
4846
*/
4947
public function __construct(\Memcached $memcached, array $memcachedOptions = array(), array $options = array())
5048
{

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

1414
/**
15-
* NativeMemcacheSessionStorage.
15+
* NativeMemcacheSessionHandler.
1616
*
1717
* Driver for the memcache session save hadlers provided by the memcache PHP extension.
1818
*
@@ -27,8 +27,6 @@ class NativeMemcacheSessionHandler extends NativeSessionHandler
2727
*
2828
* @param string $savePath Path of memcache server.
2929
* @param array $options Session configuration options.
30-
*
31-
* @see AbstractSessionStorage::__construct()
3230
*/
3331
public function __construct($savePath = 'tcp://127.0.0.1:11211?persistent=0', array $options = array())
3432
{
@@ -47,9 +45,7 @@ public function __construct($savePath = 'tcp://127.0.0.1:11211?persistent=0', ar
4745
}
4846

4947
/**
50-
* {@inheritdoc}
51-
*
52-
* Sets any values memcached ini values.
48+
* Set any memcached ini values.
5349
*
5450
* @see http://php.net/memcache.ini
5551
*/

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Ha 9E88 ndler;
1313

1414
/**
15-
* NativeMemcachedSessionStorage.
15+
* NativeMemcachedSessionHandler.
1616
*
1717
* Driver for the memcached session save hadlers provided by the memcached PHP extension.
1818
*
@@ -27,8 +27,6 @@ class NativeMemcachedSessionHandler extends NativeSessionHandler
2727
*
2828
* @param string $savePath Comma separated list of servers: e.g. memcache1.example.com:11211,memcache2.example.com:11211
2929
* @param array $options Session configuration options.
30-
*
31-
* @see AbstractSessionStorage::__construct()
3230
*/
3331
public function __construct($savePath = '127.0.0.1:11211', array $options = array())
3432
{
@@ -47,9 +45,7 @@ public function __construct($savePath = '127.0.0.1:11211', array $options = arra
4745
}
4846

4947
/**
50-
* {@inheritdoc}
51-
*
52-
* Sets any values memcached ini values.
48+
* Set any memcached ini values.
5349
*
5450
* @see https://github.com/php-memcached-dev/php-memcached/blob/master/memcached.ini
5551
*/

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

1414
/**
15-
* NativeSqliteSessionStorage.
15+
* NativeSqliteSessionHandler.
1616
*
1717
* Driver for the sqlite session save hadlers provided by the SQLite PHP extension.
1818
*
@@ -25,8 +25,6 @@ class NativeSqliteSessionHandler extends NativeSessionHandler
2525
*
2626
* @param string $savePath Path to SQLite database file itself.
2727
* @param array $options Session configuration options.
28-
*
29-
* @see AbstractSessionStorage::__construct()
3028
*/
3129
public function __construct($savePath, array $options = array())
3230
{
@@ -45,9 +43,7 @@ public function __construct($savePath, array $options = array())
4543
}
4644

4745
/**
48-
* {@inheritdoc}
49-
*
50-
* Sets any values sqlite ini values.
46+
* Set any sqlite ini values.
5147
*
5248
* @see http://php.net/sqlite.configuration
5349
*/

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

1414
/**
15-
* NullSessionStorage.
15+
* NullSessionHandler.
1616
*
1717
* Can be used in unit testing or in a sitation where persisted sessions are not desired.
1818
*

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\HttpFoundation\Session\Storage\Handler;
1313

1414
/**
15-
* PdoSessionStorage.
15+
* PdoSessionHandler.
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
1818
* @author Michael Williams <michael.williams@funsational.com>
@@ -37,14 +37,11 @@ class PdoSessionHandler implements \SessionHandlerInterface
3737
/**
3838
* Constructor.
3939
*
40-
*
4140
* @param \PDO $pdo A \PDO instance
4241
* @param array $dbOptions An associative array of DB options
4342
* @param array $options Session configuration options
4443
*
4544
* @throws \InvalidArgumentException When "db_table" option is not provided
46-
*
47-
* @see AbstractSessionStorage::__construct()
4845
*/
4946
public function __construct(\PDO $pdo, array $dbOptions = array(), array $options = array())
5047
{

‎tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler;
1515

1616
/**
17-
* Test class for DbalSessionStorage.
17+
* Test class for DbalSessionHandler.
1818
*
1919
* @author Drak <drak@zikula.org>
2020
*/

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class MemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
88
{
99
/**
10-
* @var MemcacheSessionStorage
10+
* @var MemcacheSessionHandler
1111
*/
1212
protected $storage;
1313

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class NativeMemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase
1717
public function testSaveHandlers()
1818
{
1919
if (!extension_loaded('memcache')) {
20-
$this->markTestSkipped('Skipped tests SQLite extension is not present');
20+
$this->markTestSkipped('Skipped tests memcache extension is not present');
2121
}
2222

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

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class NativeMemcachedSessionHandlerTest extends \PHPUnit_Framework_TestCase
1717
public function testSaveHandlers()
1818
{
1919
if (!extension_loaded('memcached')) {
20-
$this->markTestSkipped('Skipped tests SQLite extension is not present');
20+
$this->markTestSkipped('Skipped tests memcached extension is not present');
2121
}
2222

2323
// test takes too long if memcached server is not running

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandlerTest.php

Lines ch 1241 anged: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
77

88
/**
9-
* Test class for NativeSqliteSessionStorage.
9+
* Test class for NativeSqliteSessionHandler.
1010
*
1111
* @author Drak <drak@zikula.org>
1212
*

‎tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSessionStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
1010

1111
/**
12-
* Test class for AbstractSessionStorage.
12+
* Test class for NativeSessionStorage.
1313
*
1414
* @author Drak <drak@zikula.org>
1515
*

0 commit comments

Comments
 (0)
0