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 "HTMLTitleTextField: Remove incorrect check for unsubmitted GET forms"
[lhc/web/wiklou.git]
/
includes
/
session
/
SessionInfo.php
diff --git
a/includes/session/SessionInfo.php
b/includes/session/SessionInfo.php
index
577e03a
..
882eb39
100644
(file)
--- a/
includes/session/SessionInfo.php
+++ b/
includes/session/SessionInfo.php
@@
-50,10
+50,19
@@
class SessionInfo {
/** @var UserInfo|null */
private $userInfo = null;
/** @var UserInfo|null */
private $userInfo = null;
+ /** @var bool */
private $persisted = false;
private $persisted = false;
+
+ /** @var bool */
private $remembered = false;
private $remembered = false;
+
+ /** @var bool */
private $forceHTTPS = false;
private $forceHTTPS = false;
+
+ /** @var bool */
private $idIsSafe = false;
private $idIsSafe = false;
+
+ /** @var bool */
private $forceUse = false;
/** @var array|null */
private $forceUse = false;
/** @var array|null */
@@
-147,6
+156,7
@@
class SessionInfo {
$this->idIsSafe = $data['idIsSafe'];
$this->forceUse = $data['forceUse'] && $this->provider;
} else {
$this->idIsSafe = $data['idIsSafe'];
$this->forceUse = $data['forceUse'] && $this->provider;
} else {
+ // @phan-suppress-next-line PhanUndeclaredMethod
$this->id = $this->provider->getManager()->generateSessionId();
$this->idIsSafe = true;
$this->forceUse = false;
$this->id = $this->provider->getManager()->generateSessionId();
$this->idIsSafe = true;
$this->forceUse = false;