From: WMDE-Fisch <christoph.jauera@wikimedia.de>
Date: Thu, 16 Aug 2018 09:00:06 +0000 (+0200)
Subject: Set getEditConflictMainTextBox parameter type to array
X-Git-Tag: 1.34.0-rc.0~4412^2
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=60e396da44b090fbe8fe64cb23749f4387ca8a12;p=lhc%2Fweb%2Fwiklou.git

Set getEditConflictMainTextBox parameter type to array

This is only called at one place in core and used in the TwoColConf
extention. The passed argument is always an array.

Change-Id: I4ca94442b79dc8871ed72943be733d100e093e44
---

diff --git a/includes/editpage/TextConflictHelper.php b/includes/editpage/TextConflictHelper.php
index b447b18f94..f7d0945ec4 100644
--- a/includes/editpage/TextConflictHelper.php
+++ b/includes/editpage/TextConflictHelper.php
@@ -165,10 +165,10 @@ class TextConflictHelper {
 	/**
 	 * HTML to build the textbox1 on edit conflicts
 	 *
-	 * @param mixed[]|null $customAttribs
+	 * @param array $customAttribs
 	 * @return string HTML
 	 */
-	public function getEditConflictMainTextBox( $customAttribs = [] ) {
+	public function getEditConflictMainTextBox( array $customAttribs = [] ) {
 		$builder = new TextboxBuilder();
 		$classes = $builder->getTextboxProtectionCSSClasses( $this->title );