Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/148598
Change subject: Remove deprecated class StubContLang
......................................................................
Remove deprecated class StubContLang
Change-Id: I4569f5d59018f0d5082888fdc737cf30370bcbdd
---
M RELEASE-NOTES-1.24
M includes/AutoLoader.php
M includes/StubObject.php
M tests/parser/parserTest.inc
M tests/phpunit/suites/UploadFromUrlTestSuite.php
5 files changed, 1 insertion(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/98/148598/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 37ddc66..6d13c91 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -315,6 +315,7 @@
* RevertFileAction - Use RevertAction directly
* HistoryPage - Use HistoryAction directly
* RawPage - Use RawAction directly
+* StubContLang - Use Language::factory() instead
== Compatibility ==
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 046a0df..1393685 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -165,7 +165,6 @@
'Status' => 'includes/Status.php',
'StreamFile' => 'includes/StreamFile.php',
'StringPrefixSearch' => 'includes/PrefixSearch.php',
- 'StubContLang' => 'includes/StubObject.php',
'StubObject' => 'includes/StubObject.php',
'StubUserLang' => 'includes/StubObject.php',
'TablePager' => 'includes/Pager.php',
diff --git a/includes/StubObject.php b/includes/StubObject.php
index fb9b3e4..ee1df29 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -164,35 +164,6 @@
}
/**
- * Stub object for the content language of this wiki. This object have to be in
- * $wgContLang global.
- *
- * @deprecated since 1.18
- */
-class StubContLang extends StubObject {
-
- function __construct() {
- wfDeprecated( __CLASS__, '1.18' );
- parent::__construct( 'wgContLang' );
- }
-
- function __call( $name, $args ) {
- return $this->_call( $name, $args );
- }
-
- /**
- * @return Language
- */
- function _newObject() {
- global $wgLanguageCode;
- $obj = Language::factory( $wgLanguageCode );
- $obj->initEncoding();
- $obj->initContLang();
- return $obj;
- }
-}
-
-/**
* Stub object for the user language. It depends of the user preferences and
* "uselang" parameter that can be passed to index.php. This object have to be
* in $wgLang global.
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 027c7b9..5d05ca0 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -208,7 +208,6 @@
$messageMemc = wfGetMessageCacheStorage();
$parserMemc = wfGetParserCacheStorage();
- // $wgContLang = new StubContLang;
$wgUser = new User;
$context = new RequestContext;
$wgLang = $context->getLanguage();
diff --git a/tests/phpunit/suites/UploadFromUrlTestSuite.php
b/tests/phpunit/suites/UploadFromUrlTestSuite.php
index b27337b..bd82d21 100644
--- a/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -62,7 +62,6 @@
$messageMemc = wfGetMessageCacheStorage();
$parserMemc = wfGetParserCacheStorage();
- // $wgContLang = new StubContLang;
$wgUser = new User;
$context = new RequestContext;
$wgLang = $context->getLanguage();
--
To view, visit https://gerrit.wikimedia.org/r/148598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4569f5d59018f0d5082888fdc737cf30370bcbdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
