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

Merge "api: Inject services into ApiQueryImageInfo/ApiQueryStashImageInfo"

Browse source
This commit is contained in:
jenkins-bot 2021-07-04 23:41:42 +00:00 committed by Gerrit Code Review
commit 195fb38405
3 changed files with 94 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
includes/api/ApiQuery.php
View file

@ -60,7 +60,15 @@ class ApiQuery extends ApiBase {
'extlinks' => ApiQueryExternalLinks::class,
'fileusage' => ApiQueryBacklinksprop::class,
'images' => ApiQueryImages::class,
'imageinfo' => ApiQueryImageInfo::class,
'imageinfo' => [
'class' => ApiQueryImageInfo::class,
'services' => [
// Same as for stashimageinfo
'RepoGroup',
'ContentLanguage',
'BadFileLookup',
]
],
'info' => [
'class' => ApiQueryInfo::class,
'services' => [
@ -95,7 +103,15 @@ class ApiQuery extends ApiBase {
],
'redirects' => ApiQueryBacklinksprop::class,
'revisions' => ApiQueryRevisions::class,
'stashimageinfo' => ApiQueryStashImageInfo::class,
'stashimageinfo' => [
'class' => ApiQueryStashImageInfo::class,
'services' => [
// Same as for imageinfo
'RepoGroup',
'ContentLanguage',
'BadFileLookup',
]
],
'templates' => [
'class' => ApiQueryLinks::class,
'services' => [

61
includes/api/ApiQueryImageInfo.php
View file

@ -20,6 +20,7 @@
* @file
*/
use MediaWiki\BadFileLookup;
use MediaWiki\MediaWikiServices;
/**
@ -31,14 +32,51 @@ class ApiQueryImageInfo extends ApiQueryBase {
public const TRANSFORM_LIMIT = 50;
private static $transformCount = 0;
public function __construct( ApiQuery $query, $moduleName, $prefix = 'ii' ) {
// We allow a subclass to override the prefix, to create a related API
// module. Some other parts of MediaWiki construct this with a null
// $prefix, which used to be ignored when this only took two arguments
if ( $prefix === null ) {
/** @var RepoGroup */
private $repoGroup;
/** @var Language */
private $contentLanguage;
/** @var BadFileLookup */
private $badFileLookup;
/**
* @param ApiQuery $query
* @param string $moduleName
* @param string|RepoGroup|null $prefixOrRepoGroup
* @param RepoGroup|Language|null $repoGroupOrContentLanguage
* @param Language|BadFileLookup|null $contentLanguageOrBadFileLookup
* @param BadFileLookup|null $badFileLookupOrUnused
*/
public function __construct(
ApiQuery $query,
$moduleName,
$prefixOrRepoGroup = null,
$repoGroupOrContentLanguage = null,
$contentLanguageOrBadFileLookup = null,
$badFileLookupOrUnused = null
) {
// We allow a subclass to override the prefix, to create a related API module.
// The ObjectFactory is injecting the services without the prefix.
if ( !is_string( $prefixOrRepoGroup ) ) {
$prefix = 'ii';
$repoGroup = $prefixOrRepoGroup;
$contentLanguage = $repoGroupOrContentLanguage;
$badFileLookup = $contentLanguageOrBadFileLookup;
// $badFileLookupOrUnused is null in this case
} else {
$prefix = $prefixOrRepoGroup;
$repoGroup = $repoGroupOrContentLanguage;
$contentLanguage = $contentLanguageOrBadFileLookup;
$badFileLookup = $badFileLookupOrUnused;
}
parent::__construct( $query, $moduleName, $prefix );
// This class is extended and therefor fallback to global state - T259960
$services = MediaWikiServices::getInstance();
$this->repoGroup = $repoGroup ?? $services->getRepoGroup();
$this->contentLanguage = $contentLanguage ?? $services->getContentLanguage();
$this->badFileLookup = $badFileLookup ?? $services->getBadFileLookup();
}
public function execute() {
@ -95,12 +133,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
];
}, $titles );
$services = MediaWikiServices::getInstance();
$repoGroup = $services->getRepoGroup();
if ( $params['localonly'] ) {
$images = $repoGroup->getLocalRepo()->findFiles( $findTitles );
$images = $this->repoGroup->getLocalRepo()->findFiles( $findTitles );
} else {
$images = $repoGroup->findFiles( $findTitles );
$images = $this->repoGroup->findFiles( $findTitles );
}
$result = $this->getResult();
@ -112,7 +148,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
if ( !isset( $images[$title] ) ) {
if ( isset( $prop['uploadwarning'] ) || isset( $prop['badfile'] ) ) {
// uploadwarning and badfile need info about non-existing files
$images[$title] = $repoGroup->getLocalRepo()->newFile( $title );
$images[$title] = $this->repoGroup->getLocalRepo()->newFile( $title );
// Doesn't exist, so set an empty image repository
$info['imagerepository'] = '';
} else {
@ -145,8 +181,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
$info['imagerepository'] = $img->getRepoName();
}
if ( isset( $prop['badfile'] ) ) {
$info['badfile'] = (bool)$services->getBadFileLookup()
->isBadFile( $title, $badFileContextTitle );
$info['badfile'] = (bool)$this->badFileLookup->isBadFile( $title, $badFileContextTitle );
}
$fit = $result->addValue( [ 'query', 'pages' ], (int)$pageId, $info );
@ -706,7 +741,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
'extmetadatalanguage' => [
ApiBase::PARAM_TYPE => 'string',
ApiBase::PARAM_DFLT =>
MediaWikiServices::getInstance()->getContentLanguage()->getCode(),
$this->contentLanguage->getCode(),
],
'extmetadatamultilang' => [
ApiBase::PARAM_TYPE => 'boolean',

33
includes/api/ApiQueryStashImageInfo.php
View file

@ -20,7 +20,7 @@
* @file
*/
use MediaWiki\MediaWikiServices;
use MediaWiki\BadFileLookup;
/**
* A query action to get image information from temporarily stashed files.
@ -29,8 +29,32 @@ use MediaWiki\MediaWikiServices;
*/
class ApiQueryStashImageInfo extends ApiQueryImageInfo {
public function __construct( ApiQuery $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'sii' );
/** @var RepoGroup */
private $repoGroup;
/**
* @param ApiQuery $query
* @param string $moduleName
* @param RepoGroup $repoGroup
* @param Language $contentLanguage
* @param BadFileLookup $badFileLookup
*/
public function __construct(
ApiQuery $query,
$moduleName,
RepoGroup $repoGroup,
Language $contentLanguage,
BadFileLookup $badFileLookup
) {
parent::__construct(
$query,
$moduleName,
'sii',
$repoGroup,
$contentLanguage,
$badFileLookup
);
$this->repoGroup = $repoGroup;
}
public function execute() {
@ -55,8 +79,7 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
}
try {
$stash = MediaWikiServices::getInstance()->getRepoGroup()
->getLocalRepo()->getUploadStash( $this->getUser() );
$stash = $this->repoGroup->getLocalRepo()->getUploadStash( $this->getUser() );
foreach ( $params['filekey'] as $filekey ) {
$file = $stash->getFile( $filekey );