aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/revisiondelete/RevDelArchivedFileItem.php4
-rw-r--r--includes/revisiondelete/RevDelFileItem.php4
-rw-r--r--includes/revisiondelete/RevDelFileList.php2
-rw-r--r--includes/specialpage/SpecialPageFactory.php1
-rw-r--r--includes/specials/SpecialFileDuplicateSearch.php2
-rw-r--r--includes/specials/SpecialRevisionDelete.php9
-rw-r--r--includes/specials/SpecialUndelete.php2
-rw-r--r--includes/specials/SpecialUploadStash.php8
-rw-r--r--includes/specials/SpecialWantedfiles.php2
-rw-r--r--includes/specials/forms/UploadForm.php3
-rw-r--r--includes/specials/pagers/ImageListPager.php2
11 files changed, 27 insertions, 12 deletions
diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php b/includes/revisiondelete/RevDelArchivedFileItem.php
index d47d84879a6c..3c4179d90f95 100644
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -19,6 +19,7 @@
* @ingroup RevisionDelete
*/
+use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord;
/**
@@ -33,7 +34,8 @@ class RevDelArchivedFileItem extends RevDelFileItem {
public function __construct( RevisionListBase $list, $row ) {
parent::__construct( $list, $row );
- $this->lockFile = RepoGroup::singleton()->getLocalRepo()->newFile( $row->fa_name );
+ $this->lockFile = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
+ ->newFile( $row->fa_name );
}
protected static function initFile( $list, $row ) {
diff --git a/includes/revisiondelete/RevDelFileItem.php b/includes/revisiondelete/RevDelFileItem.php
index a69b8a23a4dd..f0f9df73777e 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -19,6 +19,7 @@
* @ingroup RevisionDelete
*/
+use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord;
/**
@@ -43,7 +44,8 @@ class RevDelFileItem extends RevDelItem {
* @return mixed
*/
protected static function initFile( $list, $row ) {
- return RepoGroup::singleton()->getLocalRepo()->newFileFromRow( $row );
+ return MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
+ ->newFileFromRow( $row );
}
public function getIdField() {
diff --git a/includes/revisiondelete/RevDelFileList.php b/includes/revisiondelete/RevDelFileList.php
index ca7bc040d0fa..ebe3c8fd25ca 100644
--- a/includes/revisiondelete/RevDelFileList.php
+++ b/includes/revisiondelete/RevDelFileList.php
@@ -87,7 +87,7 @@ class RevDelFileList extends RevDelList {
public function doPreCommitUpdates() {
$status = Status::newGood();
- $repo = RepoGroup::singleton()->getLocalRepo();
+ $repo = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo();
if ( $this->storeBatch ) {
$status->merge( $repo->storeBatch( $this->storeBatch, FileRepo::OVERWRITE_SAME ) );
}
diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index 20ff1d05cffc..bfc214d8c4f4 100644
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -220,6 +220,7 @@ class SpecialPageFactory {
'class' => \SpecialRevisionDelete::class,
'services' => [
'PermissionManager',
+ 'RepoGroup',
],
],
'RunJobs' => \SpecialRunJobs::class,
diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index f047e1f8bbf3..e2bc62d52f5b 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -65,7 +65,7 @@ class SpecialFileDuplicateSearch extends QueryPage {
* @return array Array of File objects
*/
function getDupes() {
- return RepoGroup::singleton()->findBySha1( $this->hash );
+ return MediaWikiServices::getInstance()->getRepoGroup()->findBySha1( $this->hash );
}
/**
diff --git a/includes/specials/SpecialRevisionDelete.php b/includes/specials/SpecialRevisionDelete.php
index 343423bb5833..68c64a8ee727 100644
--- a/includes/specials/SpecialRevisionDelete.php
+++ b/includes/specials/SpecialRevisionDelete.php
@@ -70,6 +70,9 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
/** @var PermissionManager */
private $permissionManager;
+ /** @var RepoGroup */
+ private $repoGroup;
+
/**
* UI labels for each type.
*/
@@ -115,11 +118,13 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
* @inheritDoc
*
* @param PermissionManager $permissionManager
+ * @param RepoGroup $repoGroup
*/
- public function __construct( PermissionManager $permissionManager ) {
+ public function __construct( PermissionManager $permissionManager, RepoGroup $repoGroup ) {
parent::__construct( 'Revisiondelete', 'deleterevision' );
$this->permissionManager = $permissionManager;
+ $this->repoGroup = $repoGroup;
}
public function doesWrites() {
@@ -322,7 +327,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
* @throws PermissionsError
*/
protected function tryShowFile( $archiveName ) {
- $repo = RepoGroup::singleton()->getLocalRepo();
+ $repo = $this->repoGroup->getLocalRepo();
$oimage = $repo->newFromArchiveName( $this->targetObj, $archiveName );
$oimage->load();
// Check if user is allowed to see this file
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index d2575568f62a..8ee578e1d896 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -735,7 +735,7 @@ class SpecialUndelete extends SpecialPage {
$response->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' );
$response->header( 'Pragma: no-cache' );
- $repo = RepoGroup::singleton()->getLocalRepo();
+ $repo = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo();
$path = $repo->getZonePath( 'deleted' ) . '/' . $repo->getDeletedHashPath( $key ) . $key;
$repo->streamFileWithStatus( $path );
}
diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php
index dac19a313505..ba1a3332e108 100644
--- a/includes/specials/SpecialUploadStash.php
+++ b/includes/specials/SpecialUploadStash.php
@@ -20,6 +20,8 @@
* @file
*/
+use MediaWiki\MediaWikiServices;
+
/**
* Web access for files temporarily stored by UploadStash.
*
@@ -66,7 +68,8 @@ class SpecialUploadStash extends UnlistedSpecialPage {
public function execute( $subPage ) {
$this->useTransactionalTimeLimit();
- $this->stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $this->getUser() );
+ $this->stash = MediaWikiServices::getInstance()->getRepoGroup()
+ ->getLocalRepo()->getUploadStash( $this->getUser() );
$this->checkPermissions();
if ( $subPage === null || $subPage === '' ) {
@@ -373,7 +376,8 @@ class SpecialUploadStash extends UnlistedSpecialPage {
*/
public static function tryClearStashedUploads( $formData, $form ) {
if ( isset( $formData['Clear'] ) ) {
- $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $form->getUser() );
+ $stash = MediaWikiServices::getInstance()->getRepoGroup()
+ ->getLocalRepo()->getUploadStash( $form->getUser() );
wfDebug( 'stash has: ' . print_r( $stash->listFiles(), true ) . "\n" );
if ( !$stash->clear() ) {
diff --git a/includes/specials/SpecialWantedfiles.php b/includes/specials/SpecialWantedfiles.php
index aa3a971d96eb..b42e5a95316a 100644
--- a/includes/specials/SpecialWantedfiles.php
+++ b/includes/specials/SpecialWantedfiles.php
@@ -79,7 +79,7 @@ class WantedFilesPage extends WantedQueryPage {
* @return bool
*/
protected function likelyToHaveFalsePositives() {
- return RepoGroup::singleton()->hasForeignRepos();
+ return MediaWikiServices::getInstance()->getRepoGroup()->hasForeignRepos();
}
/**
diff --git a/includes/specials/forms/UploadForm.php b/includes/specials/forms/UploadForm.php
index 75b9965627eb..307b5a3b0fc6 100644
--- a/includes/specials/forms/UploadForm.php
+++ b/includes/specials/forms/UploadForm.php
@@ -257,7 +257,8 @@ class UploadForm extends HTMLForm {
protected function getDescriptionSection() {
$config = $this->getConfig();
if ( $this->mSessionKey ) {
- $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $this->getUser() );
+ $stash = MediaWikiServices::getInstance()->getRepoGroup()
+ ->getLocalRepo()->getUploadStash( $this->getUser() );
try {
$file = $stash->getFile( $this->mSessionKey );
} catch ( Exception $e ) {
diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php
index ea46b6a0480e..52b8f1915d8d 100644
--- a/includes/specials/pagers/ImageListPager.php
+++ b/includes/specials/pagers/ImageListPager.php
@@ -443,7 +443,7 @@ class ImageListPager extends TablePager {
switch ( $field ) {
case 'thumb':
$opt = [ 'time' => wfTimestamp( TS_MW, $this->mCurrentRow->img_timestamp ) ];
- $file = RepoGroup::singleton()->getLocalRepo()->findFile( $value, $opt );
+ $file = $services->getRepoGroup()->getLocalRepo()->findFile( $value, $opt );
// If statement for paranoia
if ( $file ) {
$thumb = $file->transform( [ 'width' => 180, 'height' => 360 ] );
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 18:45:59 +0000