From f351cdc52c619c09ccae7d7e64b508f218598761 Mon Sep 17 00:00:00 2001 From: Andrej Hudec Date: Sat, 17 Mar 2012 00:59:57 +0100 Subject: [PATCH] doc fix --- .../Session/Storage/Handler/MemcacheSessionHandler.php | 4 +--- .../Session/Storage/Handler/MemcachedSessionHandler.php | 4 +--- .../Storage/Handler/NativeMemcacheSessionHandler.php | 8 ++------ .../Storage/Handler/NativeMemcachedSessionHandler.php | 8 ++------ .../Storage/Handler/NativeSqliteSessionHandler.php | 8 ++------ .../Session/Storage/Handler/NullSessionHandler.php | 2 +- .../Session/Storage/Handler/PdoSessionHandler.php | 5 +---- .../Doctrine/HttpFoundation/DbalSessionHandlerTest.php | 2 +- .../Storage/Handler/MemcacheSessionHandlerTest.php | 2 +- .../Storage/Handler/NativeMemcacheSessionHandlerTest.php | 2 +- .../Storage/Handler/NativeMemcachedSessionHandlerTest.php | 2 +- .../Storage/Handler/NativeSqliteSessionHandlerTest.php | 2 +- .../Session/Storage/NativeSessionStorageTest.php | 2 +- 13 files changed, 16 insertions(+), 35 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php index 72ecac5550780..00488fd0d992a 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; /** - * MemcacheSessionStorage. + * MemcacheSessionHandler. * * @author Drak */ @@ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php index bc642cb082869..71770dda83d73 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php @@ -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. @@ -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()) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php index beef87e965ddf..baacf29272b38 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandler.php @@ -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. * @@ -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()) { @@ -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 */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php index d66dc953d6d45..d84bdfbe6da94 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandler.php @@ -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. * @@ -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()) { @@ -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 */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php index 4f383efb054d7..098cc8a68a8df 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandler.php @@ -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. * @@ -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()) { @@ -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 */ diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php index 0839622aeaa7c..dd9f0c79aebe9 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NullSessionHandler.php @@ -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. * diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php index 8175090da0b32..28dccba801574 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php @@ -12,7 +12,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Handler; /** - * PdoSessionStorage. + * PdoSessionHandler. * * @author Fabien Potencier * @author Michael Williams @@ -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()) { diff --git a/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php b/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php index eda2dac30d196..9262db496a397 100644 --- a/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php +++ b/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php @@ -14,7 +14,7 @@ use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler; /** - * Test class for DbalSessionStorage. + * Test class for DbalSessionHandler. * * @author Drak */ diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandlerTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandlerTest.php index 3d4adfab47f64..d1c3f52fb9a08 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandlerTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandlerTest.php @@ -7,7 +7,7 @@ class MemcacheSessionHandlerTest extends \PHPUnit_Framework_TestCase { /** - * @var MemcacheSessionStorage + * @var MemcacheSessionHandler */ protected $storage; diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandlerTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandlerTest.php index 3dbcb4f7f81ba..8bd7eb384ba55 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandlerTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcacheSessionHandlerTest.php @@ -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')); diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandlerTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandlerTest.php index a85fbdd056f4c..ee8eeb81dcb97 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandlerTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeMemcachedSessionHandlerTest.php @@ -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 diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandlerTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandlerTest.php index 9867e49590edd..2f740437e622c 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandlerTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/NativeSqliteSessionHandlerTest.php @@ -6,7 +6,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; /** - * Test class for NativeSqliteSessionStorage. + * Test class for NativeSqliteSessionHandler. * * @author Drak * diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSessionStorageTest.php index 26f6113448011..336aff605b07f 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSessionStorageTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/NativeSessionStorageTest.php @@ -9,7 +9,7 @@ use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag; /** - * Test class for AbstractSessionStorage. + * Test class for NativeSessionStorage. * * @author Drak *