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 "Globally unsuppress phan issues with low count"
[lhc/web/wiklou.git]
/
includes
/
session
/
SessionManager.php
diff --git
a/includes/session/SessionManager.php
b/includes/session/SessionManager.php
index
98c0499
..
85f4569
100644
(file)
--- a/
includes/session/SessionManager.php
+++ b/
includes/session/SessionManager.php
@@
-329,12
+329,9
@@
final class SessionManager implements SessionManagerInterface {
$headers = [];
foreach ( $this->getProviders() as $provider ) {
foreach ( $provider->getVaryHeaders() as $header => $options ) {
$headers = [];
foreach ( $this->getProviders() as $provider ) {
foreach ( $provider->getVaryHeaders() as $header => $options ) {
- if ( !isset( $headers[$header] ) ) {
- $headers[$header] = [];
- }
- if ( is_array( $options ) ) {
- $headers[$header] = array_unique( array_merge( $headers[$header], $options ) );
- }
+ # Note that the $options value returned has been deprecated
+ # and is ignored.
+ $headers[$header] = null;
}
}
$this->varyHeaders = $headers;
}
}
$this->varyHeaders = $headers;
@@
-413,6
+410,7
@@
final class SessionManager implements SessionManagerInterface {
$provider->setConfig( $this->config );
$provider->setManager( $this );
if ( isset( $this->sessionProviders[(string)$provider] ) ) {
$provider->setConfig( $this->config );
$provider->setManager( $this );
if ( isset( $this->sessionProviders[(string)$provider] ) ) {
+ // @phan-suppress-next-line PhanTypeSuspiciousStringExpression
throw new \UnexpectedValueException( "Duplicate provider name \"$provider\"" );
}
$this->sessionProviders[(string)$provider] = $provider;
throw new \UnexpectedValueException( "Duplicate provider name \"$provider\"" );
}
$this->sessionProviders[(string)$provider] = $provider;
@@
-942,6
+940,6
@@
final class SessionManager implements SessionManagerInterface {
self::$globalSessionRequest = null;
}
self::$globalSessionRequest = null;
}
- /**
@}
*/
+ /**
@}
*/
}
}