From ee66a53468d58ddf9eb2067504a5253c3e553661 Mon Sep 17 00:00:00 2001
From: "Ariel T. Glenn" <ariel@wikimedia.org>
Date: Mon, 13 May 2019 13:38:37 +0300
Subject: [PATCH] move 7zip.inc to a regular php file

Bug: T182814
Change-Id: I53746333fe3c1cdc357bf46d71a351231a845e2f
---
 .phpcs.xml                                            | 3 +--
 autoload.php                                          | 2 +-
 maintenance/{7zip.inc => includes/SevenZipStream.php} | 0
 maintenance/includes/TextPassDumper.php               | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename maintenance/{7zip.inc => includes/SevenZipStream.php} (100%)

diff --git a/.phpcs.xml b/.phpcs.xml
index 38fb95249d..22b74b514a 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -110,7 +110,6 @@
 		<exclude-pattern>*/includes/specials/SpecialWantedpages\.php</exclude-pattern>
 		<exclude-pattern>*/includes/specials/SpecialWantedtemplates\.php</exclude-pattern>
 		<exclude-pattern>*/includes/specials/SpecialWithoutinterwiki\.php</exclude-pattern>
-		<exclude-pattern>*/maintenance/7zip.inc</exclude-pattern>
 		<exclude-pattern>*/maintenance/CodeCleanerGlobalsPass.inc</exclude-pattern>
 		<exclude-pattern>*/maintenance/archives/upgradeLogging\.php</exclude-pattern>
 		<exclude-pattern>*/maintenance/benchmarks/bench_HTTP_HTTPS\.php</exclude-pattern>
@@ -226,7 +225,7 @@
 		-->
 		<exclude-pattern>*/includes/GlobalFunctions\.php</exclude-pattern>
 		<exclude-pattern>*/includes/libs/filebackend/FSFileBackend\.php</exclude-pattern>
-		<exclude-pattern>*/maintenance/7zip\.inc</exclude-pattern>
+		<exclude-pattern>*/maintenance/includes/SevenZipStream\.php</exclude-pattern>
 		<exclude-pattern>*/maintenance/populateImageSha1\.php</exclude-pattern>
 	</rule>
 	<rule ref="MediaWiki.Usage.ForbiddenFunctions.proc_open">
diff --git a/autoload.php b/autoload.php
index 31d9159552..b80efcf631 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1321,7 +1321,7 @@ $wgAutoloadLocalClasses = [
 	'SearchUpdate' => __DIR__ . '/includes/deferred/SearchUpdate.php',
 	'SectionProfileCallback' => __DIR__ . '/includes/profiler/SectionProfileCallback.php',
 	'SectionProfiler' => __DIR__ . '/includes/profiler/SectionProfiler.php',
-	'SevenZipStream' => __DIR__ . '/maintenance/7zip.inc',
+	'SevenZipStream' => __DIR__ . '/maintenance/includes/SevenZipStream.php',
 	'ShiConverter' => __DIR__ . '/languages/classes/LanguageShi.php',
 	'ShortPagesPage' => __DIR__ . '/includes/specials/SpecialShortpages.php',
 	'ShowJobs' => __DIR__ . '/maintenance/showJobs.php',
diff --git a/maintenance/7zip.inc b/maintenance/includes/SevenZipStream.php
similarity index 100%
rename from maintenance/7zip.inc
rename to maintenance/includes/SevenZipStream.php
diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php
index a5dee982a0..03cad5c978 100644
--- a/maintenance/includes/TextPassDumper.php
+++ b/maintenance/includes/TextPassDumper.php
@@ -26,7 +26,7 @@
  */
 
 require_once __DIR__ . '/BackupDumper.php';
-require_once __DIR__ . '/../7zip.inc';
+require_once __DIR__ . '/SevenZipStream.php';
 require_once __DIR__ . '/../../includes/export/WikiExporter.php';
 
 use MediaWiki\MediaWikiServices;
-- 
2.20.1