From: Ariel T. Glenn Date: Mon, 13 May 2019 10:38:37 +0000 (+0300) Subject: move 7zip.inc to a regular php file X-Git-Tag: 1.34.0-rc.0~1705^2 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=ee66a534;p=lhc%2Fweb%2Fwiklou.git move 7zip.inc to a regular php file Bug: T182814 Change-Id: I53746333fe3c1cdc357bf46d71a351231a845e2f --- diff --git a/.phpcs.xml b/.phpcs.xml index 38fb95249d..22b74b514a 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -110,7 +110,6 @@ */includes/specials/SpecialWantedpages\.php */includes/specials/SpecialWantedtemplates\.php */includes/specials/SpecialWithoutinterwiki\.php - */maintenance/7zip.inc */maintenance/CodeCleanerGlobalsPass.inc */maintenance/archives/upgradeLogging\.php */maintenance/benchmarks/bench_HTTP_HTTPS\.php @@ -226,7 +225,7 @@ --> */includes/GlobalFunctions\.php */includes/libs/filebackend/FSFileBackend\.php - */maintenance/7zip\.inc + */maintenance/includes/SevenZipStream\.php */maintenance/populateImageSha1\.php 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/7zip.inc deleted file mode 100644 index 6a763f2e1b..0000000000 --- a/maintenance/7zip.inc +++ /dev/null @@ -1,98 +0,0 @@ - - * 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 Maintenance - */ - -use MediaWiki\Shell\Shell; - -/** - * Stream wrapper around 7za filter program. - * Required since we can't pass an open file resource to XMLReader->open() - * which is used for the text prefetch. - * - * @ingroup Maintenance - */ -class SevenZipStream { - protected $stream; - - private function stripPath( $path ) { - $prefix = 'mediawiki.compress.7z://'; - - return substr( $path, strlen( $prefix ) ); - } - - function stream_open( $path, $mode, $options, &$opened_path ) { - if ( $mode[0] == 'r' ) { - $options = 'e -bd -so'; - } elseif ( $mode[0] == 'w' ) { - $options = 'a -bd -si'; - } else { - return false; - } - $arg = Shell::escape( $this->stripPath( $path ) ); - $command = "7za $options $arg"; - if ( !wfIsWindows() ) { - // Suppress the stupid messages on stderr - $command .= ' 2>/dev/null'; - } - $this->stream = popen( $command, $mode[0] ); // popen() doesn't like two-letter modes - return ( $this->stream !== false ); - } - - function url_stat( $path, $flags ) { - return stat( $this->stripPath( $path ) ); - } - - // This is all so lame; there should be a default class we can extend - - function stream_close() { - return fclose( $this->stream ); - } - - function stream_flush() { - return fflush( $this->stream ); - } - - function stream_read( $count ) { - return fread( $this->stream, $count ); - } - - function stream_write( $data ) { - return fwrite( $this->stream, $data ); - } - - function stream_tell() { - return ftell( $this->stream ); - } - - function stream_eof() { - return feof( $this->stream ); - } - - function stream_seek( $offset, $whence ) { - return fseek( $this->stream, $offset, $whence ); - } -} - -stream_wrapper_register( 'mediawiki.compress.7z', SevenZipStream::class ); diff --git a/maintenance/includes/SevenZipStream.php b/maintenance/includes/SevenZipStream.php new file mode 100644 index 0000000000..6a763f2e1b --- /dev/null +++ b/maintenance/includes/SevenZipStream.php @@ -0,0 +1,98 @@ + + * 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 Maintenance + */ + +use MediaWiki\Shell\Shell; + +/** + * Stream wrapper around 7za filter program. + * Required since we can't pass an open file resource to XMLReader->open() + * which is used for the text prefetch. + * + * @ingroup Maintenance + */ +class SevenZipStream { + protected $stream; + + private function stripPath( $path ) { + $prefix = 'mediawiki.compress.7z://'; + + return substr( $path, strlen( $prefix ) ); + } + + function stream_open( $path, $mode, $options, &$opened_path ) { + if ( $mode[0] == 'r' ) { + $options = 'e -bd -so'; + } elseif ( $mode[0] == 'w' ) { + $options = 'a -bd -si'; + } else { + return false; + } + $arg = Shell::escape( $this->stripPath( $path ) ); + $command = "7za $options $arg"; + if ( !wfIsWindows() ) { + // Suppress the stupid messages on stderr + $command .= ' 2>/dev/null'; + } + $this->stream = popen( $command, $mode[0] ); // popen() doesn't like two-letter modes + return ( $this->stream !== false ); + } + + function url_stat( $path, $flags ) { + return stat( $this->stripPath( $path ) ); + } + + // This is all so lame; there should be a default class we can extend + + function stream_close() { + return fclose( $this->stream ); + } + + function stream_flush() { + return fflush( $this->stream ); + } + + function stream_read( $count ) { + return fread( $this->stream, $count ); + } + + function stream_write( $data ) { + return fwrite( $this->stream, $data ); + } + + function stream_tell() { + return ftell( $this->stream ); + } + + function stream_eof() { + return feof( $this->stream ); + } + + function stream_seek( $offset, $whence ) { + return fseek( $this->stream, $offset, $whence ); + } +} + +stream_wrapper_register( 'mediawiki.compress.7z', SevenZipStream::class ); 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;