Remove language as string for DateFormatter::getInstance

Change-Id: I677ab561d67b63f0c86f65fadf9319e41444a22a

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 7971bcc..c9ebbfb 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -50,6 +50,8 @@ changes to languages because of Phabricator reports.
   Use Skin::msg() instead.
 * wfInitShellLocale() was removed (deprecated in 1.30).
 * wfShellExecDisabled() was removed (deprecated in 1.30).
+* The type string for the parameter $lang of DateFormatter::getInstance is
+  removed (deprecated in 1.31).
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing

diff --git a/includes/parser/DateFormatter.php b/includes/parser/DateFormatter.php
index 0a4a60e..2aefc03 100644 (file)
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -130,13 +130,10 @@ class DateFormatter {
         *     Defaults to the site content language
         * @return DateFormatter
         */
-       public static function getInstance( $lang = null ) {
+       public static function getInstance( Language $lang = null ) {
                global $wgContLang, $wgMainCacheType;
 
-               if ( is_string( $lang ) ) {
-                       wfDeprecated( __METHOD__ . ' with type string for $lang', '1.31' );
-               }
-               $lang = $lang ? wfGetLangObj( $lang ) : $wgContLang;
+               $lang = $lang ?: $wgContLang;
                $cache = ObjectCache::getLocalServerInstance( $wgMainCacheType );
 
                static $dateFormatter = false;