From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 5 Jul 2019 21:32:55 +0000 (+0000)
Subject: Merge "Adjust type hints in htmlform related classes"
X-Git-Tag: 1.34.0-rc.0~1152
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=5b202d729d540bdabbf74c3faf8e3ce5e946cbb1;p=lhc%2Fweb%2Fwiklou.git

Merge "Adjust type hints in htmlform related classes"
---

5b202d729d540bdabbf74c3faf8e3ce5e946cbb1
diff --cc includes/htmlform/HTMLForm.php
index 99e387a24b,86f9dba34a..a7cef3cbe6
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@@ -180,10 -180,12 +180,11 @@@ class HTMLForm extends ContextSource 
  	protected $mMessagePrefix;
  
  	/** @var HTMLFormField[] */
 -	protected $mFlatFields;
 -
 -	protected $mFieldTree;
 +	protected $mFlatFields = [];
 +	protected $mFieldTree = [];
  	protected $mShowReset = false;
  	protected $mShowSubmit = true;
+ 	/** @var string[] */
  	protected $mSubmitFlags = [ 'primary', 'progressive' ];
  	protected $mShowCancel = false;
  	protected $mCancelTarget;