Merge "rcfeed: Replace usage of deprecated class RCFeedEngine (in comments)"

diff --combined includes/DefaultSettings.php
index 4cafc8f,bcb5b8f..4ba1836
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -6852,7 -6852,7 +6852,7 @@@ $wgRCLinkDays = [ 1, 3, 7, 14, 30 ]
   * FormattedRCFeed-specific options:
   * - 'uri' -- [required] The address to which the messages are sent.
   *   The uri scheme of this string will be looked up in $wgRCEngines
-  *   to determine which RCFeedEngine class to use.
+  *   to determine which FormattedRCFeed class to use.
   * - 'formatter' -- [required] The class (implementing RCFeedFormatter) which will
   *   produce the text to send. This can also be an object of the class.
   *   Formatters available by default: JSONRCFeedFormatter, XMLRCFeedFormatter,
@@@ -7506,7 -7506,6 +7506,7 @@@ $wgServiceWiringFiles = 
   * 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.
 + * The callback takes (Title, array map of parameters) as arguments.
   */
  $wgJobClasses = [
        'deletePage' => DeletePageJob::class,
@@@ -7531,7 -7530,6 +7531,7 @@@
        'cdnPurge' => CdnPurgeJob::class,
        'userGroupExpiry' => UserGroupExpiryJob::class,
        'clearWatchlistNotifications' => ClearWatchlistNotificationsJob::class,
 +      'userOptionsUpdate' => UserOptionsUpdateJob::class,
        'enqueue' => EnqueueJob::class, // local queue for multi-DC setups
        'null' => NullJob::class,
  ];
@@@ -8399,7 -8397,7 +8399,7 @@@ $wgAsyncHTTPTimeout = 25
  /**
   * Proxy to use for CURL requests.
   */
 -$wgHTTPProxy = false;
 +$wgHTTPProxy = '';
  
  /**
   * Local virtual hosts.
@@@ -8986,7 -8984,7 +8986,7 @@@ $wgXmlDumpSchemaVersion = XML_DUMP_SCHE
   * @since 1.32 changed allowed flags
   * @var int An appropriate combination of SCHEMA_COMPAT_XXX flags.
   */
 -$wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW;
 +$wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_NEW;
  
  /**
   * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages