Merge "Depedency inject remappedTableName() map via MWLBFactory"

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index afa0574..ca14864 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4402,26 +4402,26 @@ HTML
        }
 
        /**
-        * @param OutputPage &$out
+        * @param OutputPage $out
         * @since 1.29
         */
-       protected function addExplainConflictHeader( OutputPage &$out ) {
+       protected function addExplainConflictHeader( OutputPage $out ) {
                $out->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
        }
 
        /**
         * @param string $name
         * @param mixed[] $customAttribs
-        * @param User $wgUser
+        * @param User $user
         * @return mixed[]
         * @since 1.29
         */
-       protected function buildTextboxAttribs( $name, array $customAttribs, User $wgUser ) {
+       protected function buildTextboxAttribs( $name, array $customAttribs, User $user ) {
                $attribs = $customAttribs + [
                                'accesskey' => ',',
                                'id' => $name,
-                               'cols' => $wgUser->getIntOption( 'cols' ),
-                               'rows' => $wgUser->getIntOption( 'rows' ),
+                               'cols' => $user->getIntOption( 'cols' ),
+                               'rows' => $user->getIntOption( 'rows' ),
                                // Avoid PHP notices when appending preferences
                                // (appending allows customAttribs['style'] to still work).
                                'style' => ''
@@ -4432,7 +4432,7 @@ HTML
                // * mw-editfont-monospace
                // * mw-editfont-sans-serif
                // * mw-editfont-serif
-               $class = 'mw-editfont-' . $wgUser->getOption( 'editfont' );
+               $class = 'mw-editfont-' . $user->getOption( 'editfont' );
 
                if ( isset( $attribs['class'] ) ) {
                        if ( is_string( $attribs['class'] ) ) {