dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Title: Title::getSubpage should not lose the interwiki prefix"
[lhc/web/wiklou.git]
/
includes
/
session
/
PHPSessionHandler.php
diff --git
a/includes/session/PHPSessionHandler.php
b/includes/session/PHPSessionHandler.php
index
157cc52
..
4d447d3
100644
(file)
--- a/
includes/session/PHPSessionHandler.php
+++ b/
includes/session/PHPSessionHandler.php
@@
-37,9
+37,11
@@
class PHPSessionHandler implements \SessionHandlerInterface {
/** @var bool Whether PHP session handling is enabled */
protected $enable = false;
/** @var bool Whether PHP session handling is enabled */
protected $enable = false;
+
+ /** @var bool */
protected $warn = true;
protected $warn = true;
- /** @var SessionManager|null */
+ /** @var SessionManager
Interface
|null */
protected $manager;
/** @var BagOStuff|null */
protected $manager;
/** @var BagOStuff|null */
@@
-51,7
+53,7
@@
class PHPSessionHandler implements \SessionHandlerInterface {
/** @var array Track original session fields for later modification check */
protected $sessionFieldCache = [];
/** @var array Track original session fields for later modification check */
protected $sessionFieldCache = [];
- protected function __construct( SessionManager $manager ) {
+ protected function __construct( SessionManager
Interface
$manager ) {
$this->setEnableFlags(
\RequestContext::getMain()->getConfig()->get( 'PHPSessionHandling' )
);
$this->setEnableFlags(
\RequestContext::getMain()->getConfig()->get( 'PHPSessionHandling' )
);
@@
-103,9
+105,9
@@
class PHPSessionHandler implements \SessionHandlerInterface {
/**
* Install a session handler for the current web request
/**
* Install a session handler for the current web request
- * @param SessionManager $manager
+ * @param SessionManager
Interface
$manager
*/
*/
- public static function install( SessionManager $manager ) {
+ public static function install( SessionManager
Interface
$manager ) {
if ( self::$instance ) {
$manager->setupPHPSessionHandler( self::$instance );
return;
if ( self::$instance ) {
$manager->setupPHPSessionHandler( self::$instance );
return;
@@
-149,12
+151,12
@@
class PHPSessionHandler implements \SessionHandlerInterface {
/**
* Set the manager, store, and logger
* @private Use self::install().
/**
* Set the manager, store, and logger
* @private Use self::install().
- * @param SessionManager $manager
+ * @param SessionManager
Interface
$manager
* @param BagOStuff $store
* @param LoggerInterface $logger
*/
public function setManager(
* @param BagOStuff $store
* @param LoggerInterface $logger
*/
public function setManager(
- SessionManager $manager, BagOStuff $store, LoggerInterface $logger
+ SessionManager
Interface
$manager, BagOStuff $store, LoggerInterface $logger
) {
if ( $this->manager !== $manager ) {
// Close any existing session before we change stores
) {
if ( $this->manager !== $manager ) {
// Close any existing session before we change stores