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 b447b18..f7d0945 100644 (file)
--- 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 );