From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 13 Sep 2019 21:49:14 +0000 (+0000)
Subject: Merge "Declare dynamic properties"
X-Git-Tag: 1.34.0-rc.0~229
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d2f799f103d0b576e2e5b1764df449ec3016d3c4;hp=643a2e527c03cedb96a6b725a4d292faf7f76aa8

Merge "Declare dynamic properties"
---

diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 8b5d9956ab..a1be271848 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -58,6 +58,18 @@ class ProtectionForm {
 	/** @var array Map of action to the expiry time of the existing protection */
 	protected $mExistingExpiry = [];
 
+	/** @var Article */
+	protected $mArticle;
+
+	/** @var Title */
+	protected $mTitle;
+
+	/** @var bool */
+	protected $disabled;
+
+	/** @var array */
+	protected $disabledAttrib;
+
 	/** @var IContextSource */
 	private $mContext;
 
@@ -78,7 +90,7 @@ class ProtectionForm {
 		if ( wfReadOnly() ) {
 			$this->mPermErrors[] = [ 'readonlytext', wfReadOnlyReason() ];
 		}
-		$this->disabled = $this->mPermErrors != [];
+		$this->disabled = $this->mPermErrors !== [];
 		$this->disabledAttrib = $this->disabled
 			? [ 'disabled' => 'disabled' ]
 			: [];
diff --git a/includes/export/DumpMultiWriter.php b/includes/export/DumpMultiWriter.php
index 92118fe41d..2f5b3dc6df 100644
--- a/includes/export/DumpMultiWriter.php
+++ b/includes/export/DumpMultiWriter.php
@@ -27,6 +27,10 @@
  * @ingroup Dump
  */
 class DumpMultiWriter {
+	/** @var array */
+	private $sinks;
+	/** @var int */
+	private $count;
 
 	/**
 	 * @param array $sinks
diff --git a/includes/filerepo/file/LocalFileMoveBatch.php b/includes/filerepo/file/LocalFileMoveBatch.php
index 21980b90eb..0cdc2d5de1 100644
--- a/includes/filerepo/file/LocalFileMoveBatch.php
+++ b/includes/filerepo/file/LocalFileMoveBatch.php
@@ -46,6 +46,24 @@ class LocalFileMoveBatch {
 	/** @var IDatabase */
 	protected $db;
 
+	/** @var string */
+	protected $oldHash;
+
+	/** @var string */
+	protected $newHash;
+
+	/** @var string */
+	protected $oldName;
+
+	/** @var string */
+	protected $newName;
+
+	/** @var string */
+	protected $oldRel;
+
+	/** @var string */
+	protected $newRel;
+
 	/**
 	 * @param File $file
 	 * @param Title $target
diff --git a/includes/gallery/ImageGalleryBase.php b/includes/gallery/ImageGalleryBase.php
index c6d8ddf3db..4781a489f5 100644
--- a/includes/gallery/ImageGalleryBase.php
+++ b/includes/gallery/ImageGalleryBase.php
@@ -88,6 +88,15 @@ abstract class ImageGalleryBase extends ContextSource {
 	/** @var array */
 	protected $mAttribs = [];
 
+	/** @var int */
+	protected $mPerRow;
+
+	/** @var int */
+	protected $mWidths;
+
+	/** @var int */
+	protected $mHeights;
+
 	/** @var array */
 	private static $modeMapping;
 
diff --git a/includes/import/ImportStringSource.php b/includes/import/ImportStringSource.php
index fdd1f77774..b75ea1a192 100644
--- a/includes/import/ImportStringSource.php
+++ b/includes/import/ImportStringSource.php
@@ -32,6 +32,12 @@
  * @ingroup SpecialPage
  */
 class ImportStringSource implements ImportSource {
+	/** @var string */
+	private $mString;
+
+	/** @var bool */
+	private $mRead;
+
 	/**
 	 * @param string $string
 	 */
diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index 47aed56a64..5e9fdb8d03 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -53,6 +53,12 @@ class LogPager extends ReverseChronologicalPager {
 	/** @var bool */
 	private $actionRestrictionsEnforced = false;
 
+	/** @var array */
+	private $mConds;
+
+	/** @var string */
+	private $mTagFilter;
+
 	/** @var LogEventsList */
 	public $mLogEventsList;