From: Umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 5 Jul 2019 20:12:31 +0000 (+0200)
Subject: Use SessionManagerInterface in PHPSessionHandler
X-Git-Tag: 1.34.0-rc.0~1071^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=8bdd844f7def4c50929297fef6496650359130a0;p=lhc%2Fweb%2Fwiklou.git

Use SessionManagerInterface in PHPSessionHandler

SessionManager::singleton is returning the interface and that is used
for PHPSessionHandler::install, so switching the whole class to the
interface as type hint

Change-Id: I400ad1d13df92983142e735749ee8d2e12d28b34
---

diff --git a/includes/session/PHPSessionHandler.php b/includes/session/PHPSessionHandler.php
index f14e0eb740..4d447d3996 100644
--- a/includes/session/PHPSessionHandler.php
+++ b/includes/session/PHPSessionHandler.php
@@ -41,7 +41,7 @@ class PHPSessionHandler implements \SessionHandlerInterface {
 	/** @var bool */
 	protected $warn = true;
 
-	/** @var SessionManager|null */
+	/** @var SessionManagerInterface|null */
 	protected $manager;
 
 	/** @var BagOStuff|null */
@@ -53,7 +53,7 @@ class PHPSessionHandler implements \SessionHandlerInterface {
 	/** @var array Track original session fields for later modification check */
 	protected $sessionFieldCache = [];
 
-	protected function __construct( SessionManager $manager ) {
+	protected function __construct( SessionManagerInterface $manager ) {
 		$this->setEnableFlags(
 			\RequestContext::getMain()->getConfig()->get( 'PHPSessionHandling' )
 		);
@@ -105,9 +105,9 @@ class PHPSessionHandler implements \SessionHandlerInterface {
 
 	/**
 	 * Install a session handler for the current web request
-	 * @param SessionManager $manager
+	 * @param SessionManagerInterface $manager
 	 */
-	public static function install( SessionManager $manager ) {
+	public static function install( SessionManagerInterface $manager ) {
 		if ( self::$instance ) {
 			$manager->setupPHPSessionHandler( self::$instance );
 			return;
@@ -151,12 +151,12 @@ class PHPSessionHandler implements \SessionHandlerInterface {
 	/**
 	 * Set the manager, store, and logger
 	 * @private Use self::install().
-	 * @param SessionManager $manager
+	 * @param SessionManagerInterface $manager
 	 * @param BagOStuff $store
 	 * @param LoggerInterface $logger
 	 */
 	public function setManager(
-		SessionManager $manager, BagOStuff $store, LoggerInterface $logger
+		SessionManagerInterface $manager, BagOStuff $store, LoggerInterface $logger
 	) {
 		if ( $this->manager !== $manager ) {
 			// Close any existing session before we change stores