Merge "Pass phpcs-strict on includes/specials/ (2/3)"

diff --combined includes/specials/SpecialEditWatchlist.php
index 4d1933f,409a6ae..86433ca
--- 1/includes/specials/SpecialEditWatchlist.php
--- 2/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@@ -562,7 -562,8 +562,8 @@@ class SpecialEditWatchlist extends Unli
                $context->setTitle( $this->getPageTitle() ); // Remove subpage
                $form = new EditWatchlistNormalHTMLForm( $fields, $context );
                $form->setSubmitTextMsg( 'watchlistedit-normal-submit' );
-               # Used message keys: 'accesskey-watchlistedit-normal-submit', 'tooltip-watchlistedit-normal-submit'
+               # Used message keys:
+               # 'accesskey-watchlistedit-normal-submit', 'tooltip-watchlistedit-normal-submit'
                $form->setSubmitTooltip( 'watchlistedit-normal-submit' );
                $form->setWrapperLegendMsg( 'watchlistedit-normal-legend' );
                $form->addHeaderText( $this->msg( 'watchlistedit-normal-explain' )->parse() );
@@@ -603,7 -604,10 +604,10 @@@
                        );
                }
  
-               wfRunHooks( 'WatchlistEditorBuildRemoveLine', array( &$tools, $title, $title->isRedirect(), $this->getSkin() ) );
+               wfRunHooks(
+                       'WatchlistEditorBuildRemoveLine',
+                       array( &$tools, $title, $title->isRedirect(), $this->getSkin() )
+               );
  
                return $link . " (" . $this->getLanguage()->pipeList( $tools ) . ")";
        }
@@@ -714,6 -718,10 +718,6 @@@
        }
  }
  
 -# B/C since 1.18
 -class WatchlistEditor extends SpecialEditWatchlist {
 -}
 -
  /**
   * Extend HTMLForm purely so we can have a more sane way of getting the section headers
   */