From 80da67d69f237ceb26a5768818644b5a459d2f37 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 16 Feb 2019 21:21:03 +0100
Subject: [PATCH] Add @var to class properties to clarify types

Change-Id: Ia6e9eb70c68b5922077c8e5940b436844fa36e25
---
 includes/session/CookieSessionProvider.php    |  3 +++
 .../ImmutableSessionProviderWithCookie.php    |  1 +
 includes/session/PHPSessionHandler.php        |  2 ++
 includes/session/SessionBackend.php           | 19 +++++++++++++++++++
 includes/session/SessionInfo.php              |  9 +++++++++
 includes/session/Token.php                    |  5 +++++
 includes/session/UserInfo.php                 |  1 +
 7 files changed, 40 insertions(+)

diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php
index aaa522a917..6ad00eab30 100644
--- a/includes/session/CookieSessionProvider.php
+++ b/includes/session/CookieSessionProvider.php
@@ -35,7 +35,10 @@ use WebRequest;
  */
 class CookieSessionProvider extends SessionProvider {
 
+	/** @var mixed[] */
 	protected $params = [];
+
+	/** @var mixed[] */
 	protected $cookieOptions = [];
 
 	/**
diff --git a/includes/session/ImmutableSessionProviderWithCookie.php b/includes/session/ImmutableSessionProviderWithCookie.php
index 200b913389..149bb802ab 100644
--- a/includes/session/ImmutableSessionProviderWithCookie.php
+++ b/includes/session/ImmutableSessionProviderWithCookie.php
@@ -41,6 +41,7 @@ abstract class ImmutableSessionProviderWithCookie extends SessionProvider {
 
 	/** @var string|null */
 	protected $sessionCookieName = null;
+	/** @var mixed[] */
 	protected $sessionCookieOptions = [];
 
 	/**
diff --git a/includes/session/PHPSessionHandler.php b/includes/session/PHPSessionHandler.php
index 157cc52ff2..f14e0eb740 100644
--- a/includes/session/PHPSessionHandler.php
+++ b/includes/session/PHPSessionHandler.php
@@ -37,6 +37,8 @@ class PHPSessionHandler implements \SessionHandlerInterface {
 
 	/** @var bool Whether PHP session handling is enabled */
 	protected $enable = false;
+
+	/** @var bool */
 	protected $warn = true;
 
 	/** @var SessionManager|null */
diff --git a/includes/session/SessionBackend.php b/includes/session/SessionBackend.php
index f3bfb2b951..7956e9fecb 100644
--- a/includes/session/SessionBackend.php
+++ b/includes/session/SessionBackend.php
@@ -50,15 +50,25 @@ final class SessionBackend {
 	/** @var SessionId */
 	private $id;
 
+	/** @var bool */
 	private $persist = false;
+
+	/** @var bool */
 	private $remember = false;
+
+	/** @var bool */
 	private $forceHTTPS = false;
 
 	/** @var array|null */
 	private $data = null;
 
+	/** @var bool */
 	private $forcePersist = false;
+
+	/** @var bool */
 	private $metaDirty = false;
+
+	/** @var bool */
 	private $dataDirty = false;
 
 	/** @var string Used to detect subarray modifications */
@@ -76,6 +86,7 @@ final class SessionBackend {
 	/** @var User */
 	private $user;
 
+	/** @var int */
 	private $curIndex = 0;
 
 	/** @var WebRequest[] Session requests */
@@ -87,13 +98,21 @@ final class SessionBackend {
 	/** @var array|null provider-specified metadata */
 	private $providerMetadata = null;
 
+	/** @var int */
 	private $expires = 0;
+
+	/** @var int */
 	private $loggedOut = 0;
+
+	/** @var int */
 	private $delaySave = 0;
 
+	/** @var bool */
 	private $usePhpSessionHandling = true;
+	/** @var bool */
 	private $checkPHPSessionRecursionGuard = false;
 
+	/** @var bool */
 	private $shutdown = false;
 
 	/**
diff --git a/includes/session/SessionInfo.php b/includes/session/SessionInfo.php
index 577e03a264..a7bbcce2e2 100644
--- a/includes/session/SessionInfo.php
+++ b/includes/session/SessionInfo.php
@@ -50,10 +50,19 @@ class SessionInfo {
 	/** @var UserInfo|null */
 	private $userInfo = null;
 
+	/** @var bool */
 	private $persisted = false;
+
+	/** @var bool */
 	private $remembered = false;
+
+	/** @var bool */
 	private $forceHTTPS = false;
+
+	/** @var bool */
 	private $idIsSafe = false;
+
+	/** @var bool */
 	private $forceUse = false;
 
 	/** @var array|null */
diff --git a/includes/session/Token.php b/includes/session/Token.php
index 14d239d5a9..5165506ded 100644
--- a/includes/session/Token.php
+++ b/includes/session/Token.php
@@ -34,8 +34,13 @@ class Token {
 	 * editing from certain broken proxies. */
 	const SUFFIX = '+\\';
 
+	/** @var string */
 	private $secret = '';
+
+	/** @var string */
 	private $salt = '';
+
+	/** @var bool */
 	private $new = false;
 
 	/**
diff --git a/includes/session/UserInfo.php b/includes/session/UserInfo.php
index c01b9eca9d..f5145a3f41 100644
--- a/includes/session/UserInfo.php
+++ b/includes/session/UserInfo.php
@@ -49,6 +49,7 @@ use User;
  * @since 1.27
  */
 final class UserInfo {
+	/** @var bool */
 	private $verified = false;
 
 	/** @var User|null */
-- 
2.20.1