Merge "Remove auto-generated "Constructor" documentation on constructors"

diff --combined includes/context/DerivativeContext.php
index 0d0c149,8705e27..6e3eda6
--- 1/includes/context/DerivativeContext.php
--- 2/includes/context/DerivativeContext.php
+++ b/includes/context/DerivativeContext.php
@@@ -75,7 -75,6 +75,6 @@@ class DerivativeContext extends Context
        private $timing;
  
        /**
-        * Constructor
         * @param IContextSource $context Context to inherit from
         */
        public function __construct( IContextSource $context ) {
@@@ -109,7 -108,7 +108,7 @@@
         *
         * @deprecated since 1.27 use a StatsdDataFactory from MediaWikiServices (preferably injected)
         *
 -       * @return MediawikiStatsdDataFactory
 +       * @return IBufferingStatsdDataFactory
         */
        public function getStats() {
                return MediaWikiServices::getInstance()->getStatsdDataFactory();

diff --combined includes/diff/DifferenceEngine.php
index 95420d9,cbed78f..d4bee29
--- 1/includes/diff/DifferenceEngine.php
--- 2/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@@ -104,7 -104,6 +104,6 @@@ class DifferenceEngine extends ContextS
        /**#@-*/
  
        /**
-        * Constructor
         * @param IContextSource $context Context to use, anything else will be ignored
         * @param int $old Old ID we want to show and diff with.
         * @param string|int $new Either revision ID or 'prev' or 'next'. Default: 0.
@@@ -377,11 -376,6 +376,11 @@@
                        }
                }
  
 +              $out->addJsConfigVars( [
 +                      'wgDiffOldId' => $this->mOldid,
 +                      'wgDiffNewId' => $this->mNewid,
 +              ] );
 +
                # Make "next revision link"
                # Skip next link on the top revision
                if ( $samePage && !$this->mNewRev->isCurrent() ) {
@@@ -913,35 -907,10 +912,35 @@@
                        $wgExternalDiffEngine = false;
                }
  
 +              // Better external diff engine, the 2 may some day be dropped
 +              // This one does the escaping and segmenting itself
                if ( function_exists( 'wikidiff2_do_diff' ) && $wgExternalDiffEngine === false ) {
 -                      # Better external diff engine, the 2 may some day be dropped
 -                      # This one does the escaping and segmenting itself
 -                      $text = wikidiff2_do_diff( $otext, $ntext, 2 );
 +                      $wikidiff2Version = phpversion( 'wikidiff2' );
 +                      if (
 +                              $wikidiff2Version !== false &&
 +                              version_compare( $wikidiff2Version, '0.3.0', '>=' )
 +                      ) {
 +                              $text = wikidiff2_do_diff(
 +                                      $otext,
 +                                      $ntext,
 +                                      2,
 +                                      $this->getConfig()->get( 'WikiDiff2MovedParagraphDetectionCutoff' )
 +                              );
 +                      } else {
 +                              // Don't pass the 4th parameter for compatibility with older versions of wikidiff2
 +                              $text = wikidiff2_do_diff(
 +                                      $otext,
 +                                      $ntext,
 +                                      2
 +                              );
 +
 +                              // Log a warning in case the configuration value is set to not silently ignore it
 +                              if ( $this->getConfig()->get( 'WikiDiff2MovedParagraphDetectionCutoff' ) > 0 ) {
 +                                      wfLogWarning( '$wgWikiDiff2MovedParagraphDetectionCutoff is set but has no
 +                                              effect since the used version of WikiDiff2 does not support it.' );
 +                              }
 +                      }
 +
                        $text .= $this->debug( 'wikidiff2' );
  
                        return $text;

diff --combined maintenance/generateSitemap.php
index 8a837d2,fe0691b..d273a6a
--- 1/maintenance/generateSitemap.php
--- 2/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@@ -140,9 -140,6 +140,6 @@@ class GenerateSitemap extends Maintenan
         */
        private $identifier;
  
-       /**
-        * Constructor
-        */
        public function __construct() {
                parent::__construct();
                $this->addDescription( 'Creates a sitemap for the site' );
@@@ -195,7 -192,7 +192,7 @@@
                }
                $this->identifier = $this->getOption( 'identifier', wfWikiID() );
                $this->compress = $this->getOption( 'compress', 'yes' ) !== 'no';
 -              $this->skipRedirects = $this->getOption( 'skip-redirects', false ) !== false;
 +              $this->skipRedirects = $this->hasOption( 'skip-redirects' );
                $this->dbr = $this->getDB( DB_REPLICA );
                $this->generateNamespaces();
                $this->timestamp = wfTimestamp( TS_ISO_8601, wfTimestampNow() );