Hard deprecate JobQueueGroup::singleton()/destroySingletons()

Bug: T301016
Change-Id: I7873224af5cb40a17eb0c6b06cbc39f0d8c6e7c1
This commit is contained in:
Umherirrender 2022-06-24 18:48:31 +02:00
parent 09b92847f8
commit 049c6f198d
3 changed files with 6 additions and 3 deletions

View file

@ -387,6 +387,8 @@ because of Phabricator reports.
warnings.
* Access to previously public properties User::$mBlock, User::$mBlockedby, and
User::$mHideName, deprecated in 1.35, now emits deprecation warnings.
* JobQueueGroup::singleton() and ::destroySingletons(), deprecated in 1.37, now
emits deprecation warnings.
* …
=== Other changes in 1.39 ===

View file

@ -167,7 +167,6 @@ class ForkController {
protected function prepareEnvironment() {
// Don't share DB, storage, or memcached connections
MediaWikiServices::resetChildProcessServices();
JobQueueGroup::destroySingletons();
ObjectCache::clear();
RedisConnectionPool::destroySingletons();
}

View file

@ -107,21 +107,23 @@ class JobQueueGroup {
}
/**
* @deprecated since 1.37 Use JobQueueGroupFactory::makeJobQueueGroup
* @deprecated since 1.37 Use JobQueueGroupFactory::makeJobQueueGroup (hard deprecated since 1.39)
* @param bool|string $domain Wiki domain ID
* @return JobQueueGroup
*/
public static function singleton( $domain = false ) {
wfDeprecated( __METHOD__, '1.37' );
return MediaWikiServices::getInstance()->getJobQueueGroupFactory()->makeJobQueueGroup( $domain );
}
/**
* Destroy the singleton instances
*
* @deprecated since 1.37
* @deprecated since 1.37 (hard deprecated since 1.39)
* @return void
*/
public static function destroySingletons() {
wfDeprecated( __METHOD__, '1.37' );
}
/**