diff options
| author | Umherirrender <umherirrender_de.wp@web.de> | 2022-06-24 18:48:31 +0200 |
|---|---|---|
| committer | Umherirrender <umherirrender_de.wp@web.de> | 2022-06-24 18:48:31 +0200 |
| commit | 049c6f198d8e90cb778b2bab7e7704bcc027dd2d (patch) | |
| tree | 86ab9388f11d7d6d17cce99c8085c43968a5d08c | |
| parent | 09b92847f8a32da4f5e52aef5d9c541dfd193289 (diff) | |
| download | mediawikicore-049c6f198d8e90cb778b2bab7e7704bcc027dd2d.tar.gz mediawikicore-049c6f198d8e90cb778b2bab7e7704bcc027dd2d.zip | |
Hard deprecate JobQueueGroup::singleton()/destroySingletons()
Bug: T301016
Change-Id: I7873224af5cb40a17eb0c6b06cbc39f0d8c6e7c1
| -rw-r--r-- | RELEASE-NOTES-1.39 | 2 | ||||
| -rw-r--r-- | includes/ForkController.php | 1 | ||||
| -rw-r--r-- | includes/jobqueue/JobQueueGroup.php | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/RELEASE-NOTES-1.39 b/RELEASE-NOTES-1.39 index 5cc9ad0441b3..0803cad4b648 100644 --- a/RELEASE-NOTES-1.39 +++ b/RELEASE-NOTES-1.39 @@ -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 === diff --git a/includes/ForkController.php b/includes/ForkController.php index bfbf9f102392..1ed02007d244 100644 --- a/includes/ForkController.php +++ b/includes/ForkController.php @@ -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(); } diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php index b44073af233a..110a1c1be646 100644 --- a/includes/jobqueue/JobQueueGroup.php +++ b/includes/jobqueue/JobQueueGroup.php @@ -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' ); } /** |