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 "Add mw-changeslist-(log|ns)-* class to OldChangesList as well"
[lhc/web/wiklou.git]
/
includes
/
session
/
SessionInfo.php
diff --git
a/includes/session/SessionInfo.php
b/includes/session/SessionInfo.php
index
9fe2cdf
..
1b5a834
100644
(file)
--- a/
includes/session/SessionInfo.php
+++ b/
includes/session/SessionInfo.php
@@
-23,10
+23,6
@@
namespace MediaWiki\Session;
namespace MediaWiki\Session;
-use Psr\Log\LoggerInterface;
-use BagOStuff;
-use WebRequest;
-
/**
* Value object returned by SessionProvider
*
/**
* Value object returned by SessionProvider
*
@@
-92,7
+88,7
@@
class SessionInfo {
if ( !$from instanceof SessionInfo ) {
throw new \InvalidArgumentException( 'Invalid copyFrom' );
}
if ( !$from instanceof SessionInfo ) {
throw new \InvalidArgumentException( 'Invalid copyFrom' );
}
- $data +=
array(
+ $data +=
[
'provider' => $from->provider,
'id' => $from->id,
'userInfo' => $from->userInfo,
'provider' => $from->provider,
'id' => $from->id,
'userInfo' => $from->userInfo,
@@
-102,10
+98,10
@@
class SessionInfo {
'metadata' => $from->providerMetadata,
'idIsSafe' => $from->idIsSafe,
// @codeCoverageIgnoreStart
'metadata' => $from->providerMetadata,
'idIsSafe' => $from->idIsSafe,
// @codeCoverageIgnoreStart
-
)
;
+
]
;
// @codeCoverageIgnoreEnd
} else {
// @codeCoverageIgnoreEnd
} else {
- $data +=
array(
+ $data +=
[
'provider' => null,
'id' => null,
'userInfo' => null,
'provider' => null,
'id' => null,
'userInfo' => null,
@@
-115,7
+111,7
@@
class SessionInfo {
'metadata' => null,
'idIsSafe' => false,
// @codeCoverageIgnoreStart
'metadata' => null,
'idIsSafe' => false,
// @codeCoverageIgnoreStart
-
)
;
+
]
;
// @codeCoverageIgnoreEnd
}
// @codeCoverageIgnoreEnd
}
@@
-207,9
+203,6
@@
class SessionInfo {
/**
* Return whether the session is persisted
/**
* Return whether the session is persisted
- *
- * i.e. a session ID was given to the constuctor
- *
* @return bool
*/
final public function wasPersisted() {
* @return bool
*/
final public function wasPersisted() {