Merge "Use MediaWiki\SuppressWarnings around trigger_error('') instead @"

[lhc/web/wiklou.git] / includes / Preferences.php

diff --git a/includes/Preferences.php b/includes/Preferences.php
index d66da93..70f7060 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -35,23 +35,17 @@ class Preferences {
         * @return DefaultPreferencesFactory
         */
        protected static function getDefaultPreferencesFactory() {
+               $services = MediaWikiServices::getInstance();
                $authManager = AuthManager::singleton();
-               $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-               $config = MediaWikiServices::getInstance()->getMainConfig();
+               $linkRenderer = $services->getLinkRenderer();
+               $config = $services->getMainConfig();
                $preferencesFactory = new DefaultPreferencesFactory(
-                       $config, MediaWikiServices::getInstance()->getContentLanguage(), $authManager,
+                       $config, $services->getContentLanguage(), $authManager,
                        $linkRenderer
                );
                return $preferencesFactory;
        }
 
-       /**
-        * @return array
-        */
-       public static function getSaveBlacklist() {
-               throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-       }
-
        /**
         * @throws MWException
         * @param User $user
@@ -59,6 +53,7 @@ class Preferences {
         * @return array|null
         */
        public static function getPreferences( $user, IContextSource $context ) {
+               wfDeprecated( __METHOD__, '1.31' );
                $preferencesFactory = self::getDefaultPreferencesFactory();
                return $preferencesFactory->getFormDescriptor( $user, $context );
        }
@@ -201,6 +196,7 @@ class Preferences {
         * @param array &$defaultPreferences
         */
        public static function miscPreferences( $user, IContextSource $context, &$defaultPreferences ) {
+               wfDeprecated( __METHOD__, '1.31' );
        }
 
        /**
@@ -270,45 +266,8 @@ class Preferences {
                $formClass = PreferencesFormLegacy::class,
                array $remove = []
        ) {
+               wfDeprecated( __METHOD__, '1.31' );
                $preferencesFactory = self::getDefaultPreferencesFactory();
                return $preferencesFactory->getForm( $user, $context, $formClass, $remove );
        }
-
-       /**
-        * @param IContextSource $context
-        * @return array
-        */
-       public static function getTimezoneOptions( IContextSource $context ) {
-               throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-       }
-
-       /**
-        * @param string $value
-        * @param array $alldata
-        * @return int
-        */
-       public static function filterIntval( $value, $alldata ) {
-               throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-       }
-
-       /**
-        * @param string $tz
-        * @param array $alldata
-        * @return string
-        */
-       public static function filterTimezoneInput( $tz, $alldata ) {
-               throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-       }
-
-       /**
-        * Get a list of all time zones
-        * @param Language $language Language used for the localized names
-        * @return array A list of all time zones. The system name of the time zone is used as key and
-        *  the value is an array which contains localized name, the timecorrection value used for
-        *  preferences and the region
-        * @since 1.26
-        */
-       public static function getTimeZoneList( Language $language ) {
-               throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-       }
 }