jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398074 )
Change subject: Fix autoloading of ExportProgressFilter
......................................................................
Fix autoloading of ExportProgressFilter
Bug: T177239
Change-Id: Ieb5d5aa78d569af8cd8f8bfa32ce10a33482cb84
---
M autoload.php
A includes/export/ExportProgressFilter.php
M maintenance/backup.inc
3 files changed, 48 insertions(+), 19 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index cd01828..3869067 100644
--- a/autoload.php
+++ b/autoload.php
@@ -449,7 +449,7 @@
'Exif' => __DIR__ . '/includes/media/Exif.php',
'ExifBitmapHandler' => __DIR__ . '/includes/media/ExifBitmap.php',
'ExplodeIterator' => __DIR__ . '/includes/libs/ExplodeIterator.php',
- 'ExportProgressFilter' => __DIR__ . '/maintenance/backup.inc',
+ 'ExportProgressFilter' => __DIR__ .
'/includes/export/ExportProgressFilter.php',
'ExportSites' => __DIR__ . '/maintenance/exportSites.php',
'ExtensionJsonValidationError' => __DIR__ .
'/includes/registration/ExtensionJsonValidationError.php',
'ExtensionJsonValidator' => __DIR__ .
'/includes/registration/ExtensionJsonValidator.php',
diff --git a/includes/export/ExportProgressFilter.php
b/includes/export/ExportProgressFilter.php
new file mode 100644
index 0000000..9b1571f
--- /dev/null
+++ b/includes/export/ExportProgressFilter.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2005 Brion Vibber <br...@pobox.com>
+ * https://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * @ingroup Dump
+ */
+class ExportProgressFilter extends DumpFilter {
+ /**
+ * @var BackupDumper
+ */
+ private $progress;
+
+ function __construct( &$sink, &$progress ) {
+ parent::__construct( $sink );
+ $this->progress = $progress;
+ }
+
+ function writeClosePage( $string ) {
+ parent::writeClosePage( $string );
+ $this->progress->reportPage();
+ }
+
+ function writeRevision( $rev, $string ) {
+ parent::writeRevision( $rev, $string );
+ $this->progress->revCount();
+ }
+}
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 341a299..00dbd00 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -25,7 +25,6 @@
*/
require_once __DIR__ . '/Maintenance.php';
-require_once __DIR__ . '/../includes/export/DumpFilter.php';
use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\Rdbms\IDatabase;
@@ -418,22 +417,5 @@
if ( $this->reporting ) {
fwrite( $this->stderr, $string . "\n" );
}
- }
-}
-
-class ExportProgressFilter extends DumpFilter {
- function __construct( &$sink, &$progress ) {
- parent::__construct( $sink );
- $this->progress = $progress;
- }
-
- function writeClosePage( $string ) {
- parent::writeClosePage( $string );
- $this->progress->reportPage();
- }
-
- function writeRevision( $rev, $string ) {
- parent::writeRevision( $rev, $string );
- $this->progress->revCount();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/398074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb5d5aa78d569af8cd8f8bfa32ce10a33482cb84
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Albert221 <w.albert...@gmail.com>
Gerrit-Reviewer: Albert221 <w.albert...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
