From cd7da66fb5ed7842e5295de7d4cd5919b9476366 Mon Sep 17 00:00:00 2001 From: Ricordisamoa Date: Sat, 26 Mar 2016 13:54:48 +0100 Subject: [PATCH] Add missing 'public' keywords to some more Language methods All of them are already being used outside the class: * getMonthAbbreviation * getMonthAbbreviationsArray * getWeekdayName * sprintfDate * userAdjust * date * time * timeanddate * getMessage * iconv * ucfirst * uc Change-Id: I63ec93858cebc02cdf3b9b042eddf4ef620cc110 --- languages/Language.php | 24 ++++++++++++------------ languages/classes/LanguageAz.php | 2 +- languages/classes/LanguageEo.php | 2 +- languages/classes/LanguageKaa.php | 2 +- languages/classes/LanguageKk.php | 2 +- languages/classes/LanguageQqx.php | 2 +- languages/classes/LanguageTr.php | 2 +- languages/classes/LanguageWa.php | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index 190f2bfe78..e7643b1e76 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -942,14 +942,14 @@ class Language { * @param string $key * @return string */ - function getMonthAbbreviation( $key ) { + public function getMonthAbbreviation( $key ) { return $this->getMessageFromDB( self::$mMonthAbbrevMsgs[$key - 1] ); } /** * @return array */ - function getMonthAbbreviationsArray() { + public function getMonthAbbreviationsArray() { $monthNames = [ '' ]; for ( $i = 1; $i < 13; $i++ ) { $monthNames[] = $this->getMonthAbbreviation( $i ); @@ -961,7 +961,7 @@ class Language { * @param string $key * @return string */ - function getWeekdayName( $key ) { + public function getWeekdayName( $key ) { return $this->getMessageFromDB( self::$mWeekdayMsgs[$key - 1] ); } @@ -1089,7 +1089,7 @@ class Language { * @throws MWException * @return string */ - function sprintfDate( $format, $ts, DateTimeZone $zone = null, &$ttl = null ) { + public function sprintfDate( $format, $ts, DateTimeZone $zone = null, &$ttl = null ) { $s = ''; $raw = false; $roman = false; @@ -2067,7 +2067,7 @@ class Language { * get user timecorrection setting) * @return int */ - function userAdjust( $ts, $tz = false ) { + public function userAdjust( $ts, $tz = false ) { global $wgUser, $wgLocalTZoffset; if ( $tz === false ) { @@ -2214,7 +2214,7 @@ class Language { * validateTimeZone() in Special:Preferences * @return string */ - function date( $ts, $adj = false, $format = true, $timecorrection = false ) { + public function date( $ts, $adj = false, $format = true, $timecorrection = false ) { $ts = wfTimestamp( TS_MW, $ts ); if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); @@ -2233,7 +2233,7 @@ class Language { * validateTimeZone() in Special:Preferences * @return string */ - function time( $ts, $adj = false, $format = true, $timecorrection = false ) { + public function time( $ts, $adj = false, $format = true, $timecorrection = false ) { $ts = wfTimestamp( TS_MW, $ts ); if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); @@ -2253,7 +2253,7 @@ class Language { * validateTimeZone() in Special:Preferences * @return string */ - function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false ) { + public function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false ) { $ts = wfTimestamp( TS_MW, $ts ); if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); @@ -2559,7 +2559,7 @@ class Language { * @param string $key * @return array|null */ - function getMessage( $key ) { + public function getMessage( $key ) { return self::$dataCache->getSubitem( $this->mCode, 'messages', $key ); } @@ -2576,7 +2576,7 @@ class Language { * @param string $string * @return string */ - function iconv( $in, $out, $string ) { + public function iconv( $in, $out, $string ) { # This is a wrapper for iconv in all languages except esperanto, # which does some nasty x-conversions beforehand @@ -2623,7 +2623,7 @@ class Language { * * @return string */ - function ucfirst( $str ) { + public function ucfirst( $str ) { $o = ord( $str ); if ( $o < 96 ) { // if already uppercase... return $str; @@ -2643,7 +2643,7 @@ class Language { * * @return string */ - function uc( $str, $first = false ) { + public function uc( $str, $first = false ) { if ( $first ) { if ( $this->isMultibyte( $str ) ) { return mb_strtoupper( mb_substr( $str, 0, 1 ) ) . mb_substr( $str, 1 ); diff --git a/languages/classes/LanguageAz.php b/languages/classes/LanguageAz.php index f9ebdec1e8..b413ef9973 100644 --- a/languages/classes/LanguageAz.php +++ b/languages/classes/LanguageAz.php @@ -32,7 +32,7 @@ class LanguageAz extends Language { * @param string $string * @return mixed|string */ - function ucfirst( $string ) { + public function ucfirst( $string ) { if ( $string[0] == 'i' ) { return 'Ä°' . substr( $string, 1 ); } diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php index 697fc93e57..3fec5fc179 100644 --- a/languages/classes/LanguageEo.php +++ b/languages/classes/LanguageEo.php @@ -59,7 +59,7 @@ class LanguageEo extends Language { * @param string $string Text to be converted * @return string */ - function iconv( $in, $out, $string ) { + public function iconv( $in, $out, $string ) { if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) { return preg_replace_callback( '/([cghjsu]x?)((?:xx)*)(?!x)/i', diff --git a/languages/classes/LanguageKaa.php b/languages/classes/LanguageKaa.php index 0cd0c0d02f..30abe25c58 100644 --- a/languages/classes/LanguageKaa.php +++ b/languages/classes/LanguageKaa.php @@ -54,7 +54,7 @@ class LanguageKaa extends Language { * * @return string */ - function ucfirst( $string ) { + public function ucfirst( $string ) { if ( substr( $string, 0, 1 ) === 'i' ) { return 'Ä°' . substr( $string, 1 ); } diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index 9c6ad44c05..548c9a0e52 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -415,7 +415,7 @@ class LanguageKk extends LanguageKk_cyrl { * * @return string */ - function ucfirst( $string ) { + public function ucfirst( $string ) { if ( $string[0] == 'i' ) { $variant = $this->getPreferredVariant(); if ( $variant == 'kk-latn' || $variant == 'kk-tr' ) { diff --git a/languages/classes/LanguageQqx.php b/languages/classes/LanguageQqx.php index 353b59a3e7..5204fb5a07 100644 --- a/languages/classes/LanguageQqx.php +++ b/languages/classes/LanguageQqx.php @@ -35,7 +35,7 @@ class LanguageQqx extends Language { * @param string $key * @return string */ - function getMessage( $key ) { + public function getMessage( $key ) { return "($key$*)"; } } diff --git a/languages/classes/LanguageTr.php b/languages/classes/LanguageTr.php index a4f05f8d94..c94734149e 100644 --- a/languages/classes/LanguageTr.php +++ b/languages/classes/LanguageTr.php @@ -37,7 +37,7 @@ class LanguageTr extends Language { * @param string $string * @return string */ - function ucfirst( $string ) { + public function ucfirst( $string ) { if ( strlen( $string ) && $string[0] == 'i' ) { return 'Ä°' . substr( $string, 1 ); } diff --git a/languages/classes/LanguageWa.php b/languages/classes/LanguageWa.php index 3520298e62..078b068242 100644 --- a/languages/classes/LanguageWa.php +++ b/languages/classes/LanguageWa.php @@ -42,7 +42,7 @@ class LanguageWa extends Language { * @param bool $tc * @return string */ - function date( $ts, $adj = false, $format = true, $tc = false ) { + public function date( $ts, $adj = false, $format = true, $tc = false ) { $ts = wfTimestamp( TS_MW, $ts ); if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); @@ -89,7 +89,7 @@ class LanguageWa extends Language { * @param bool $tc * @return string */ - function timeanddate( $ts, $adj = false, $format = true, $tc = false ) { + public function timeanddate( $ts, $adj = false, $format = true, $tc = false ) { if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); } -- 2.20.1