jenkins-bot has submitted this change and it was merged.
Change subject: Make deprecated Settings class final
......................................................................
Make deprecated Settings class final
This also adds deprecation tags to all public methods, makes one
private and fixes wrong doc tags.
Change-Id: I5ee7d2d26b38ca078987ebea05dc44ae5ff849ee
---
M lib/includes/Settings.php
1 file changed, 6 insertions(+), 10 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/Settings.php b/lib/includes/Settings.php
index 8f617cf..7aac488 100644
--- a/lib/includes/Settings.php
+++ b/lib/includes/Settings.php
@@ -14,12 +14,10 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Daniel Kinzler
*/
-class Settings extends SettingsArray {
+final class Settings extends SettingsArray {
/**
- * @see Settings::singleton
- *
- * @since 0.1
+ * @deprecated
*
* @return Settings
*/
@@ -27,7 +25,7 @@
static $instance = null;
if ( $instance === null ) {
- $instance = new static();
+ $instance = new self();
$instance->initFromGlobals();
}
@@ -38,10 +36,8 @@
* Initializes this Settings object from the global configuration
variables.
* Default settings are loaded from the appropriate files.
* The hook WikibaseDefaultSettings can be used to manipulate the
defaults.
- *
- * @since 0.4
*/
- public function initFromGlobals() {
+ private function initFromGlobals() {
$settings = array();
//NOTE: Repo overrides client. This is important especially for
@@ -64,14 +60,14 @@
/**
* Shortcut to ::singleton()->getSetting
*
- * @since 0.1
+ * @deprecated
*
* @param string $settingName
*
* @return mixed
*/
public static function get( $settingName ) {
- return static::singleton()->getSetting( $settingName );
+ return self::singleton()->getSetting( $settingName );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/203037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ee7d2d26b38ca078987ebea05dc44ae5ff849ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
