Merge "Allow callback functions for creating jobs"

diff --combined RELEASE-NOTES-1.30
index 590dc2c,5370c6d..dd2841c
--- 1/RELEASE-NOTES-1.30
--- 2/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@@ -12,13 -12,14 +12,18 @@@ production
    case.
  * $wgShellLocale now affects LC_ALL rather than only LC_CTYPE. See
    documentation of $wgShellLocale for details.
+ * $wgJobClasses may now specify callback functions
+   as an alternative to plain class names.
+   This is intended for extensions that want control
+   over the instantiation of their jobs,
+   to allow for proper dependency injection.
  
  === New features in 1.30 ===
 -* …
 +* (T37247) Output from Parser::parse() will now be wrapped in a div with
 +  class="mw-parser-output" by default. This may be changed or disabled using
 +  ParserOptions::setWrapOutputClass().
 +* Added 'ChangeTagsAllowedAdd' hook, enabling extensions to allow software-
 +  specific tags to be added by users.
  
  === External library changes in 1.30 ===
  
@@@ -35,9 -36,7 +40,9 @@@
  * …
  
  === Action API changes in 1.30 ===
 -* …
 +* (T37247) action=parse output will be wrapped in a div with
 +  class="mw-parser-output" by default. This may be changed or disabled using
 +  the new 'wrapoutputclass' parameter.
  
  === Action API internal changes in 1.30 ===
  * …

diff --combined includes/DefaultSettings.php
index f8d2d75,a6bc7e5..09a614c
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -5912,6 -5912,15 +5912,6 @@@ $wgBotPasswordsCluster = false
   */
  $wgBotPasswordsDatabase = false;
  
 -/**
 - * Whether to disable user group expiry. This is a transitional feature flag
 - * in accordance with WMF schema change policy, and will be removed later
 - * (hopefully before MW 1.29 release).
 - *
 - * @since 1.29
 - */
 -$wgDisableUserGroupExpiry = false;
 -
  /** @} */ # end of user rights settings
  
  /************************************************************************//**
@@@ -7323,8 -7332,10 +7323,10 @@@ $wgServiceWiringFiles = 
  ];
  
  /**
-  * Maps jobs to their handling classes; extensions
-  * can add to this to provide custom jobs
+  * Maps jobs to their handlers; extensions
+  * can add to this to provide custom jobs.
+  * A job handler should either be a class name to be instantiated,
+  * or (since 1.30) a callback to use for creating the job object.
   */
  $wgJobClasses = [
        'refreshLinks' => 'RefreshLinksJob',