Merge "Skin: Use WANObjectCache for sitenotice caching"

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

diff --git a/includes/site/MediaWikiPageNameNormalizer.php b/includes/site/MediaWikiPageNameNormalizer.php
index f358bd4..c4e490a 100644 (file)
--- a/includes/site/MediaWikiPageNameNormalizer.php
+++ b/includes/site/MediaWikiPageNameNormalizer.php
@@ -34,6 +34,22 @@ use UtfNormal\Validator;
  */
 class MediaWikiPageNameNormalizer {
 
+       /**
+        * @var Http
+        */
+       private $http;
+
+       /**
+        * @param Http|null $http
+        */
+       public function __construct( Http $http = null ) {
+               if ( !$http ) {
+                       $http = new Http();
+               }
+
+               $this->http = $http;
+       }
+
        /**
         * Returns the normalized form of the given page title, using the
         * normalization rules of the given site. If the given title is a redirect,
@@ -53,7 +69,6 @@ class MediaWikiPageNameNormalizer {
         * @throws \MWException
         */
        public function normalizePageName( $pageName, $apiUrl ) {
-
                // Check if we have strings as arguments.
                if ( !is_string( $pageName ) ) {
                        throw new \MWException( '$pageName must be a string' );
@@ -67,7 +82,7 @@ class MediaWikiPageNameNormalizer {
                $pageName = Validator::cleanUp( $pageName );
 
                // Build the args for the specific call
-               $args = array(
+               $args = [
                        'action' => 'query',
                        'prop' => 'info',
                        'redirects' => true,
@@ -79,13 +94,13 @@ class MediaWikiPageNameNormalizer {
                        // 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 = wfAppendQuery( $apiUrl, $args );
 
                // Go on call the external site
                // @todo we need a good way to specify a timeout here.
-               $ret = Http::get( $url, array(), __METHOD__ );
+               $ret = $this->http->get( $url, [], __METHOD__ );
 
                if ( $ret === false ) {
                        wfDebugLog( "MediaWikiSite", "call to external site failed: $url" );
@@ -146,12 +161,12 @@ class MediaWikiPageNameNormalizer {
                        return false;
                }
                // Loop over the tree different named structures, that otherwise are similar
-               $structs = array(
+               $structs = [
                        'normalized' => 'from',
                        'converted' => 'from',
                        'redirects' => 'from',
                        'pages' => 'title'
-               );
+               ];
                foreach ( $structs as $listId => $fieldId ) {
                        // Check if the substructure exist at all.
                        if ( !isset( $externalData['query'][$listId] ) ) {