From 60e396da44b090fbe8fe64cb23749f4387ca8a12 Mon Sep 17 00:00:00 2001 From: WMDE-Fisch Date: Thu, 16 Aug 2018 11:00:06 +0200 Subject: [PATCH] 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 --- includes/editpage/TextConflictHelper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ); -- 2.20.1