Merge "jsduck: Add @inheritable to static methods from jQuery plugins"

[lhc/web/wiklou.git] / includes / site / MediaWikiSite.php

diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index 21226fd..2a86b31 100644 (file)
--- a/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@ -39,9 +39,9 @@ class MediaWikiSite extends Site {
 
        /**
         * @since 1.21
-        * @deprecated Just use the constructor or the factory Site::newForType
+        * @deprecated since 1.21 Just use the constructor or the factory Site::newForType
         *
-        * @param integer $globalId
+        * @param int $globalId
         *
         * @return MediaWikiSite
         */
@@ -67,9 +67,9 @@ class MediaWikiSite extends Site {
         *
         * @since 1.21
         *
-        * @param string $title the target page's title, in normalized form.
+        * @param string $title The target page's title, in normalized form.
         *
-        * @return String
+        * @return string
         */
        public function toDBKey( $title ) {
                return str_replace( ' ', '_', $title );
@@ -123,17 +123,17 @@ class MediaWikiSite extends Site {
                                'converttitles' => true,
                                'format' => 'json',
                                'titles' => $pageName,
-                               //@todo: options for maxlag and maxage
+                               // @todo options for maxlag and maxage
                                // Note that maxlag will lead to a long delay before a reply is made,
                                // but that maxage can avoid the extreme delay. On the other hand
                                // maxage could be nice to use anyhow as it stops unnecessary requests.
                                // Also consider smaxage if maxage is used.
                        );
 
-                       $url = $this->getFileUrl( 'api.php' ) . '?' . wfArrayToCgi( $args );
+                       $url = wfAppendQuery( $this->getFileUrl( 'api.php' ), $args );
 
                        // Go on call the external site
-                       //@todo: we need a good way to specify a timeout here.
+                       // @todo we need a good way to specify a timeout here.
                        $ret = Http::get( $url );
                }
 
@@ -177,7 +177,7 @@ class MediaWikiSite extends Site {
         * @param array $externalData A reply from the API on a external server.
         * @param string $pageTitle Identifies the page at the external site, needing normalization.
         *
-        * @return array|boolean a 'page' structure representing the page identified by $pageTitle.
+        * @return array|bool A 'page' structure representing the page identified by $pageTitle.
         */
        private static function extractPageRecord( $externalData, $pageTitle ) {
                // If there is a special case with only one returned page
@@ -309,7 +309,7 @@ class MediaWikiSite extends Site {
         *
         * @since 1.21
         *
-        * @param string|boolean $pageName Page name or false (default: false)
+        * @param string|bool $pageName Page name or false (default: false)
         *
         * @return string
         */
@@ -335,7 +335,7 @@ class MediaWikiSite extends Site {
         *
         * @since 1.21
         *
-        * @param string|boolean $path
+        * @param string|bool $path
         *
         * @return string
         */