Merge "Improve type hints in export related classes"

[lhc/web/wiklou.git] / includes / export / WikiExporter.php

diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php
index 05c28fb..3ab88e2 100644 (file)
--- a/includes/export/WikiExporter.php
+++ b/includes/export/WikiExporter.php
@@ -28,6 +28,7 @@
  */
 
 use MediaWiki\MediaWikiServices as MediaWikiServicesAlias;
+use MediaWiki\Storage\RevisionRecord;
 use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 
@@ -67,6 +68,15 @@ class WikiExporter {
        /** @var XmlDumpWriter */
        private $writer;
 
+       /** @var IDatabase */
+       protected $db;
+
+       /** @var array|int */
+       protected $history;
+
+       /** @var array|null */
+       protected $limitNamespaces;
+
        /**
         * Returns the default export schema version, as defined by $wgXmlDumpSchemaVersion.
         * @return string
@@ -87,8 +97,11 @@ class WikiExporter {
         * @param null|array $limitNamespaces Comma-separated list of namespace numbers
         *   to limit results
         */
-       function __construct( $db, $history = self::CURRENT, $text = self::TEXT,
-                       $limitNamespaces = null
+       function __construct(
+               $db,
+               $history = self::CURRENT,
+               $text = self::TEXT,
+               $limitNamespaces = null
        ) {
                $this->db = $db;
                $this->history = $history;
@@ -241,7 +254,7 @@ class WikiExporter {
                                'rev_user' => $revQuery['fields']['rev_user'],
                        ],
                        [
-                               $this->db->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0',
+                               $this->db->bitAnd( 'rev_deleted', RevisionRecord::DELETED_USER ) . ' = 0',
                                $cond,
                        ],
                        __METHOD__,