Merge "UserTest: Cover User::isIP and User::isValidUserName better"

[lhc/web/wiklou.git] / includes / specials / SpecialExport.php

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 6fb5e8c..bc8e728 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -259,8 +259,14 @@ class SpecialExport extends SpecialPage {
                        ) . '<br />';
                }
 
-               // Enable this when we can do something useful exporting/importing image information. :)
-               //$form .= Xml::checkLabel( $this->msg( 'export-images' )->text(), 'images', 'wpExportImages', false ) . '<br />';
+               /* Enable this when we can do something useful exporting/importing image information.
+               $form .= Xml::checkLabel(
+                               $this->msg( 'export-images' )->text(),
+                               'images',
+                               'wpExportImages',
+                               false
+                       ) . '<br />';
+               */
                $form .= Xml::checkLabel(
                        $this->msg( 'export-download' )->text(),
                        'wpDownload',
@@ -297,10 +303,10 @@ class SpecialExport extends SpecialPage {
         * Do the actual page exporting
         *
         * @param string $page user input on what page(s) to export
-        * @param $history Mixed: one of the WikiExporter history export constants
-        * @param $list_authors Boolean: Whether to add distinct author list (when
-        *                      not returning full history)
-        * @param $exportall Boolean: Whether to export everything
+        * @param int $history One of the WikiExporter history export constants
+        * @param bool $list_authors Whether to add distinct author list (when
+        *   not returning full history)
+        * @param bool $exportall Whether to export everything
         */
        private function doExport( $page, $history, $list_authors, $exportall ) {
 
@@ -397,7 +403,7 @@ class SpecialExport extends SpecialPage {
        }
 
        /**
-        * @param $title Title
+        * @param Title $title
         * @return array
         */
        private function getPagesFromCategory( $title ) {
@@ -430,7 +436,7 @@ class SpecialExport extends SpecialPage {
        }
 
        /**
-        * @param $nsindex int
+        * @param int $nsindex
         * @return array
         */
        private function getPagesFromNamespace( $nsindex ) {
@@ -463,9 +469,9 @@ class SpecialExport extends SpecialPage {
 
        /**
         * Expand a list of pages to include templates used in those pages.
-        * @param $inputPages array, list of titles to look up
-        * @param $pageSet array, associative array indexed by titles for output
-        * @return array associative array index by titles
+        * @param array $inputPages List of titles to look up
+        * @param array $pageSet Associative array indexed by titles for output
+        * @return array Associative array index by titles
         */
        private function getTemplates( $inputPages, $pageSet ) {
                return $this->getLinks( $inputPages, $pageSet,
@@ -477,7 +483,7 @@ class SpecialExport extends SpecialPage {
 
        /**
         * Validate link depth setting, if available.
-        * @param $depth int
+        * @param int $depth
         * @return int
         */
        private function validateLinkDepth( $depth ) {
@@ -504,13 +510,15 @@ class SpecialExport extends SpecialPage {
 
        /**
         * Expand a list of pages to include pages linked to from that page.
-        * @param $inputPages array
-        * @param $pageSet array
-        * @param $depth int
+        * @param array $inputPages
+        * @param array $pageSet
+        * @param int $depth
         * @return array
         */
        private function getPageLinks( $inputPages, $pageSet, $depth ) {
+               // @codingStandardsIgnoreStart Squiz.WhiteSpace.SemicolonSpacing.Incorrect
                for ( ; $depth > 0; --$depth ) {
+                       // @codingStandardsIgnoreEnd
                        $pageSet = $this->getLinks(
                                $inputPages, $pageSet, 'pagelinks',
                                array( 'namespace' => 'pl_namespace', 'title' => 'pl_title' ),
@@ -525,8 +533,8 @@ class SpecialExport extends SpecialPage {
        /**
         * Expand a list of pages to include images used in those pages.
         *
-        * @param $inputPages array, list of titles to look up
-        * @param $pageSet array, associative array indexed by titles for output
+        * @param array $inputPages List of titles to look up
+        * @param array $pageSet Associative array indexed by titles for output
         *
         * @return array associative array index by titles
         */