X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fsession%2FSessionManager.php;h=85f4569e81fea8ae057d845756f218b6656c5a2e;hb=369c60f133a5ea36c2a96ee1a276ee43e40c7194;hp=98c04995a3784e04a669f901d6f2423dbadb3d80;hpb=0ceccf701f539fffd996a0fc8304512918425350;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php
index 98c04995a3..85f4569e81 100644
--- 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 ) {
-					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;
@@ -413,6 +410,7 @@ final class SessionManager implements SessionManagerInterface {
 				$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;
@@ -942,6 +940,6 @@ final class SessionManager implements SessionManagerInterface {
 		self::$globalSessionRequest = null;
 	}
 
-	/**@}*/
+	/** @} */
 
 }