Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorg: Move GitInfo to utils/

Browse source 
Bug: T321882
Change-Id: Ibd8aff5f57555d5b2a3b9cd121c8919a5a96d313
This commit is contained in:
Amir Sarabadani 2023-08-21 18:23:23 +02:00
parent 2a96fcb8d0
commit cb7351809e
7 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
autoload.php
View file

@ -557,7 +557,7 @@ $wgAutoloadLocalClasses = [
'GetLagTimes' => __DIR__ . '/maintenance/getLagTimes.php',
'GetReplicaServer' => __DIR__ . '/maintenance/getReplicaServer.php',
'GetTextMaint' => __DIR__ . '/maintenance/getText.php',
'GitInfo' => __DIR__ . '/includes/GitInfo.php',
'GitInfo' => __DIR__ . '/includes/utils/GitInfo.php',
'GlobalDependency' => __DIR__ . '/includes/language/dependency/GlobalDependency.php',
'GlobalVarConfig' => __DIR__ . '/includes/config/GlobalVarConfig.php',
'GrepPages' => __DIR__ . '/maintenance/grep.php',
@ -2165,6 +2165,7 @@ $wgAutoloadLocalClasses = [
'MediaWiki\\User\\UserSelectQueryBuilder' => __DIR__ . '/includes/user/UserSelectQueryBuilder.php',
'MediaWiki\\User\\UserTimeCorrection' => __DIR__ . '/includes/user/UserTimeCorrection.php',
'MediaWiki\\Utils\\ExtensionInfo' => __DIR__ . '/includes/utils/ExtensionInfo.php',
'MediaWiki\\Utils\\GitInfo' => __DIR__ . '/includes/utils/GitInfo.php',
'MediaWiki\\Utils\\MWTimestamp' => __DIR__ . '/includes/utils/MWTimestamp.php',
'MediaWiki\\Utils\\UrlUtils' => __DIR__ . '/includes/utils/UrlUtils.php',
'MediaWiki\\Watchlist\\WatchlistManager' => __DIR__ . '/includes/watchlist/WatchlistManager.php',

1
includes/api/ApiQuerySiteinfo.php
View file

@ -34,6 +34,7 @@ use MediaWiki\Title\Title;
use MediaWiki\User\UserGroupManager;
use MediaWiki\User\UserOptionsLookup;
use MediaWiki\Utils\ExtensionInfo;
use MediaWiki\Utils\GitInfo;
use MediaWiki\Utils\UrlUtils;
use MediaWiki\WikiMap\WikiMap;
use Wikimedia\ParamValidator\ParamValidator;

1
includes/debug/MWDebug.php
View file

@ -23,6 +23,7 @@
use MediaWiki\Html\Html;
use MediaWiki\Logger\LegacyLogger;
use MediaWiki\ResourceLoader\ResourceLoader;
use MediaWiki\Utils\GitInfo;
use Wikimedia\WrappedString;
use Wikimedia\WrappedStringList;

1
includes/specials/SpecialVersion.php
View file

@ -31,6 +31,7 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\ParserOutputFlags;
use MediaWiki\Utils\ExtensionInfo;
use MediaWiki\Utils\GitInfo;
use MediaWiki\Utils\MWTimestamp;
use MediaWiki\Utils\UrlUtils;
use Symfony\Component\Yaml\Yaml;

9
includes/GitInfo.php → includes/utils/GitInfo.php
View file

@ -23,6 +23,9 @@
* @file
*/
namespace MediaWiki\Utils;
use FormatJson;
use MediaWiki\Config\ServiceOptions;
use MediaWiki\HookContainer\HookRunner;
use MediaWiki\Logger\LoggerFactory;
@ -30,6 +33,7 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Shell\Shell;
use Psr\Log\LoggerInterface;
use RuntimeException;
use Wikimedia\AtEase\AtEase;
/**
@ -97,8 +101,7 @@ class GitInfo {
$this->repoDir = $repoDir;
$services = MediaWikiServices::getInstance();
$this->options = new ServiceOptions(
self::CONSTRUCTOR_OPTIONS,
$services->getMainConfig()
self::CONSTRUCTOR_OPTIONS, $services->getMainConfig()
);
$this->options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
// $this->options must be set before using getCacheFilePath()
@ -467,3 +470,5 @@ class GitInfo {
return self::$viewers;
}
}
class_alias( GitInfo::class, 'GitInfo' );

2
maintenance/version.php
View file

@ -23,6 +23,8 @@
* @since 1.36
*/
use MediaWiki\Utils\GitInfo;
require_once __DIR__ . '/Maintenance.php';
/**

1
tests/phpunit/includes/GitInfoTest.php
View file

@ -1,6 +1,7 @@
<?php
use MediaWiki\MainConfigNames;
use MediaWiki\Utils\GitInfo;
/**
* @covers GitInfo