Merge "Declare class properties in Formatter and WikiRequest"

includes/ForeignWikiRequest.php

@@ -5,6 +5,27 @@ use MediaWiki\Session\SessionManager;
 
 class EchoForeignWikiRequest {
 
+	/** @var User */
+	protected $user;
+
+	/** @var array */
+	protected $params;
+
+	/** @var array */
+	protected $wikis;
+
+	/** @varstring|null */
+	protected $wikiParam;
+
+	/** @var string */
+	protected $method;
+
+	/** @var string|null */
+	protected $tokenType;
+
+	/** @var string[]|null */
+	protected $csrfTokens;
+
 	/**
 	 * @param User $user
 	 * @param array $params Request parameters

includes/formatters/EchoEventDigestFormatter.php

@@ -7,6 +7,13 @@
  * arguments passed in the constructor (user and language)
  */
 abstract class EchoEventDigestFormatter {
+
+	/** @var User */
+	protected $user;
+
+	/** @var Language */
+	protected $language;
+
 	public function __construct( User $user, Language $language ) {
 		$this->user = $user;
 		$this->language = $language;

includes/formatters/EchoEventFormatter.php

@@ -14,6 +14,13 @@ use MediaWiki\Logger\LoggerFactory;
  * arguments passed in the constructor (user and language)
  */
 abstract class EchoEventFormatter {
+
+	/** @var User */
+	protected $user;
+
+	/** @var Language */
+	protected $language;
+
 	public function __construct( User $user, Language $language ) {
 		$this->user = $user;
 		$this->language = $language;