Hard deprecate Language::setCode

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index 1c2e4f1..0531c1f 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -245,7 +245,7 @@ class Language {
                        // It's not possible to customise this code with class files, so
                        // just return a Language object. This is to support uselang= hacks.
                        $lang = new Language;
-                       $lang->setCode( $code );
+                       $lang->mCode = $code;
                        return $lang;
                }
 
@@ -267,7 +267,7 @@ class Language {
                        $class = self::classFromCode( $fallbackCode );
                        if ( class_exists( $class ) ) {
                                $lang = new $class;
-                               $lang->setCode( $code );
+                               $lang->mCode = $code;
                                return $lang;
                        }
                }
@@ -1421,7 +1421,7 @@ class Language {
                                case 'g':
                                        $usedHour = true;
                                        $h = substr( $ts, 8, 2 );
-                                       $num = $h % 12 ? $h % 12 : 12;
+                                       $num = $h % 12 ?: 12;
                                        break;
                                case 'G':
                                        $usedHour = true;
@@ -1430,7 +1430,7 @@ class Language {
                                case 'h':
                                        $usedHour = true;
                                        $h = substr( $ts, 8, 2 );
-                                       $num = sprintf( '%02d', $h % 12 ? $h % 12 : 12 );
+                                       $num = sprintf( '%02d', $h % 12 ?: 12 );
                                        break;
                                case 'H':
                                        $usedHour = true;
@@ -4449,6 +4449,7 @@ class Language {
         * @deprecated since 1.32, use Language::factory to create a new object instead.
         */
        public function setCode( $code ) {
+               wfDeprecated( __METHOD__, '1.32' );
                $this->mCode = $code;
                // Ensure we don't leave incorrect cached data lying around
                $this->mHtmlCode = null;