Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / cache / GenderCache.php

diff --git a/includes/cache/GenderCache.php b/includes/cache/GenderCache.php
index a933527..19695df 100644 (file)
--- a/includes/cache/GenderCache.php
+++ b/includes/cache/GenderCache.php
@@ -28,7 +28,7 @@
  * @since 1.18
  */
 class GenderCache {
-       protected $cache = array();
+       protected $cache = [];
        protected $default;
        protected $misses = 0;
        protected $missLimit = 1000;
@@ -41,27 +41,30 @@ class GenderCache {
                if ( $that === null ) {
                        $that = new self();
                }
+
                return $that;
        }
 
-       protected function __construct() {}
+       protected function __construct() {
+       }
 
        /**
         * Returns the default gender option in this wiki.
-        * @return String
+        * @return string
         */
        protected function getDefault() {
                if ( $this->default === null ) {
                        $this->default = User::getDefaultOption( 'gender' );
                }
+
                return $this->default;
        }
 
        /**
         * Returns the gender for given username.
-        * @param string $username or User: username
-        * @param string $caller the calling method
-        * @return String
+        * @param string|User $username Username
+        * @param string $caller The calling method
+        * @return string
         */
        public function getGenderOf( $username, $caller = '' ) {
                global $wgUser;
@@ -77,8 +80,8 @@ class GenderCache {
                                        $this->misses++;
                                        wfDebug( __METHOD__ . ": too many misses, returning default onwards\n" );
                                }
-                               return $this->getDefault();
 
+                               return $this->getDefault();
                        } else {
                                $this->misses++;
                                $this->doQuery( $username, $caller );
@@ -94,11 +97,11 @@ class GenderCache {
        /**
         * Wrapper for doQuery that processes raw LinkBatch data.
         *
-        * @param $data
-        * @param $caller
+        * @param array $data
+        * @param string $caller
         */
        public function doLinkBatch( $data, $caller = '' ) {
-               $users = array();
+               $users = [];
                foreach ( $data as $ns => $pagenames ) {
                        if ( !MWNamespace::hasGenderDistinction( $ns ) ) {
                                continue;
@@ -115,11 +118,11 @@ class GenderCache {
         * Wrapper for doQuery that processes a title or string array.
         *
         * @since 1.20
-        * @param $titles List: array of Title objects or strings
-        * @param string $caller the calling method
+        * @param array $titles Array of Title objects or strings
+        * @param string $caller The calling method
         */
        public function doTitlesArray( $titles, $caller = '' ) {
-               $users = array();
+               $users = [];
                foreach ( $titles as $title ) {
                        $titleObj = is_string( $title ) ? Title::newFromText( $title ) : $title;
                        if ( !$titleObj ) {
@@ -136,13 +139,13 @@ class GenderCache {
 
        /**
         * Preloads genders for given list of users.
-        * @param $users List|String: usernames
-        * @param string $caller the calling method
+        * @param array|string $users Usernames
+        * @param string $caller The calling method
         */
        public function doQuery( $users, $caller = '' ) {
                $default = $this->getDefault();
 
-               $usersToCheck = array();
+               $usersToCheck = [];
                foreach ( (array)$users as $value ) {
                        $name = self::normalizeUsername( $value );
                        // Skip users whose gender setting we already know
@@ -161,17 +164,17 @@ class GenderCache {
                }
 
                $dbr = wfGetDB( DB_SLAVE );
-               $table = array( 'user', 'user_properties' );
-               $fields = array( 'user_name', 'up_value' );
-               $conds = array( 'user_name' => $usersToCheck );
-               $joins = array( 'user_properties' =>
-                       array( 'LEFT JOIN', array( 'user_id = up_user', 'up_property' => 'gender' ) ) );
+               $table = [ 'user', 'user_properties' ];
+               $fields = [ 'user_name', 'up_value' ];
+               $conds = [ 'user_name' => $usersToCheck ];
+               $joins = [ 'user_properties' =>
+                       [ 'LEFT JOIN', [ 'user_id = up_user', 'up_property' => 'gender' ] ] ];
 
                $comment = __METHOD__;
                if ( strval( $caller ) !== '' ) {
                        $comment .= "/$caller";
                }
-               $res = $dbr->select( $table, $fields, $conds, $comment, array(), $joins );
+               $res = $dbr->select( $table, $fields, $conds, $comment, [], $joins );
 
                foreach ( $res as $row ) {
                        $this->cache[$row->user_name] = $row->up_value ? $row->up_value : $default;
@@ -184,6 +187,7 @@ class GenderCache {
                if ( $indexSlash !== false ) {
                        $username = substr( $username, 0, $indexSlash );
                }
+
                // normalize underscore/spaces
                return strtr( $username, '_', ' ' );
        }