aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--autoload.php1
-rw-r--r--includes/GlobalFunctions.php1
-rw-r--r--includes/Output/StreamFile.php2
-rw-r--r--includes/ResourceLoader/Image.php2
-rw-r--r--includes/externalstore/ExternalStoreMwstore.php1
-rw-r--r--includes/filebackend/FileBackendGroup.php1
-rw-r--r--includes/filerepo/FileBackendDBRepoWrapper.php1
-rw-r--r--includes/filerepo/FileRepo.php1
-rw-r--r--includes/filerepo/ForeignAPIRepo.php1
-rw-r--r--includes/filerepo/file/File.php1
-rw-r--r--includes/filerepo/file/LocalFile.php1
-rw-r--r--includes/libs/filebackend/FSFileBackend.php1
-rw-r--r--includes/libs/filebackend/FileBackend.php24
-rw-r--r--includes/libs/filebackend/FileBackendMultiWrite.php1
-rw-r--r--includes/libs/filebackend/FileBackendStore.php1
-rw-r--r--includes/libs/filebackend/MemoryFileBackend.php1
-rw-r--r--includes/libs/filebackend/SwiftFileBackend.php1
-rw-r--r--includes/libs/filebackend/fileop/CopyFileOp.php2
-rw-r--r--includes/libs/filebackend/fileop/DeleteFileOp.php2
-rw-r--r--includes/libs/filebackend/fileop/DescribeFileOp.php2
-rw-r--r--includes/libs/filebackend/fileop/FileOp.php1
-rw-r--r--includes/libs/filebackend/fileop/MoveFileOp.php2
-rw-r--r--includes/media/MediaTransformOutput.php1
-rw-r--r--includes/upload/UploadBase.php1
-rw-r--r--includes/upload/UploadFromChunks.php1
-rw-r--r--includes/utils/MWFileProps.php2
-rw-r--r--maintenance/copyFileBackend.php1
-rw-r--r--maintenance/fileOpPerfTest.php2
-rw-r--r--maintenance/migrateFileRepoLayout.php2
-rw-r--r--tests/parser/ParserTestRunner.php1
-rw-r--r--tests/phpunit/includes/filebackend/FileBackendStoreTest.php2
-rw-r--r--tests/phpunit/includes/filebackend/SwiftFileBackendTest.php1
-rw-r--r--tests/phpunit/includes/media/ThumbnailImageTest.php2
-rw-r--r--tests/phpunit/integration/includes/libs/filebackend/FSFileBackendIntegrationTest.php2
-rw-r--r--tests/phpunit/integration/includes/libs/filebackend/FileBackendIntegrationTestBase.php1
-rw-r--r--tests/phpunit/integration/includes/utils/MWFilePropsTest.php2
-rw-r--r--tests/phpunit/mocks/filerepo/TestRepoTrait.php2
-rw-r--r--tests/phpunit/unit/includes/libs/filebackend/FileBackendTest.php4
38 files changed, 65 insertions, 13 deletions
diff --git a/autoload.php b/autoload.php
index 2eddf3c8749a..71e3ec2f76b1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -3176,6 +3176,7 @@ $wgAutoloadLocalClasses = [
'Wikimedia\\EventRelayer\\EventRelayer' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
'Wikimedia\\EventRelayer\\EventRelayerGroup' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerGroup.php',
'Wikimedia\\EventRelayer\\EventRelayerNull' => __DIR__ . '/includes/libs/eventrelayer/EventRelayerNull.php',
+ 'Wikimedia\\FileBackend\\FileBackend' => __DIR__ . '/includes/libs/filebackend/FileBackend.php',
'Wikimedia\\Http\\HttpAcceptNegotiator' => __DIR__ . '/includes/libs/http/HttpAcceptNegotiator.php',
'Wikimedia\\Http\\HttpAcceptParser' => __DIR__ . '/includes/libs/http/HttpAcceptParser.php',
'Wikimedia\\Http\\TelemetryHeadersInterface' => __DIR__ . '/includes/libs/http/TelemetryHeadersInterface.php',
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 8c53af5a2af6..e06d866a6165 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -33,6 +33,7 @@ use MediaWiki\Title\Title;
use MediaWiki\Utils\MWTimestamp;
use MediaWiki\Utils\UrlUtils;
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\ParamValidator\TypeDef\ExpiryDef;
use Wikimedia\RequestTimeout\RequestTimeout;
diff --git a/includes/Output/StreamFile.php b/includes/Output/StreamFile.php
index 677b7d28437b..8facf703e390 100644
--- a/includes/Output/StreamFile.php
+++ b/includes/Output/StreamFile.php
@@ -23,13 +23,13 @@
namespace MediaWiki\Output;
-use FileBackend;
use HTTPFileStreamer;
use InvalidArgumentException;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use RequestContext;
use UploadBase;
+use Wikimedia\FileBackend\FileBackend;
/**
* Functions related to the output of file content
diff --git a/includes/ResourceLoader/Image.php b/includes/ResourceLoader/Image.php
index 3eb01f9cd488..1632e395d41f 100644
--- a/includes/ResourceLoader/Image.php
+++ b/includes/ResourceLoader/Image.php
@@ -21,7 +21,6 @@
namespace MediaWiki\ResourceLoader;
use DOMDocument;
-use FileBackend;
use InvalidArgumentException;
use InvalidSVGException;
use MediaWiki\Languages\LanguageFallback;
@@ -31,6 +30,7 @@ use MediaWiki\Shell\Shell;
use RuntimeException;
use SvgHandler;
use SVGReader;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Minify\CSSMin;
/**
diff --git a/includes/externalstore/ExternalStoreMwstore.php b/includes/externalstore/ExternalStoreMwstore.php
index bc1ffd10a8c7..54fb9b99d149 100644
--- a/includes/externalstore/ExternalStoreMwstore.php
+++ b/includes/externalstore/ExternalStoreMwstore.php
@@ -19,6 +19,7 @@
*/
use MediaWiki\WikiMap\WikiMap;
+use Wikimedia\FileBackend\FileBackend;
/**
* External storage in a FileBackend.
diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php
index e678c710a64b..fce8d1022104 100644
--- a/includes/filebackend/FileBackendGroup.php
+++ b/includes/filebackend/FileBackendGroup.php
@@ -28,6 +28,7 @@ use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MainConfigNames;
use MediaWiki\Output\StreamFile;
use MediaWiki\Status\Status;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\ObjectFactory\ObjectFactory;
use Wikimedia\Rdbms\ReadOnlyMode;
diff --git a/includes/filerepo/FileBackendDBRepoWrapper.php b/includes/filerepo/FileBackendDBRepoWrapper.php
index a6adedd341ea..2d08720bbb30 100644
--- a/includes/filerepo/FileBackendDBRepoWrapper.php
+++ b/includes/filerepo/FileBackendDBRepoWrapper.php
@@ -19,6 +19,7 @@
*/
use MediaWiki\Output\StreamFile;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Rdbms\IDatabase;
/**
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index e3c302f84edf..8eeae37abffc 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -18,6 +18,7 @@ use MediaWiki\Title\Title;
use MediaWiki\User\UserIdentity;
use MediaWiki\Utils\MWTimestamp;
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
/**
* Base code for file repositories.
diff --git a/includes/filerepo/ForeignAPIRepo.php b/includes/filerepo/ForeignAPIRepo.php
index 7aa148d26464..5de5b88de93f 100644
--- a/includes/filerepo/ForeignAPIRepo.php
+++ b/includes/filerepo/ForeignAPIRepo.php
@@ -25,6 +25,7 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Page\PageIdentity;
use MediaWiki\Title\Title;
+use Wikimedia\FileBackend\FileBackend;
/**
* A foreign repository for a remote MediaWiki accessible through api.php requests.
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 285645b86422..8d768cb3ba29 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -19,6 +19,7 @@ use MediaWiki\PoolCounter\PoolCounterWorkViaCallback;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
use MediaWiki\User\UserIdentity;
+use Wikimedia\FileBackend\FileBackend;
/**
* Base code for files.
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 96e49d4dcee5..2b6e13b2af5b 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -33,6 +33,7 @@ use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
use MediaWiki\User\UserIdentity;
use MediaWiki\User\UserIdentityValue;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Rdbms\Blob;
use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\IReadableDatabase;
diff --git a/includes/libs/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php
index 78c698a29d15..392d4a59cc7a 100644
--- a/includes/libs/filebackend/FSFileBackend.php
+++ b/includes/libs/filebackend/FSFileBackend.php
@@ -43,6 +43,7 @@
use Shellbox\Shellbox;
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
diff --git a/includes/libs/filebackend/FileBackend.php b/includes/libs/filebackend/FileBackend.php
index 24c2c70519ee..981012c86e27 100644
--- a/includes/libs/filebackend/FileBackend.php
+++ b/includes/libs/filebackend/FileBackend.php
@@ -28,10 +28,20 @@
* @file
* @ingroup FileBackend
*/
+
+namespace Wikimedia\FileBackend;
+
+use FSFile;
+use InvalidArgumentException;
+use LockManager;
use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
+use NullLockManager;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
+use ScopedLock;
+use StatusValue;
+use TempFSFile;
use Wikimedia\ScopedCallback;
/**
@@ -191,7 +201,7 @@ abstract class FileBackend implements LoggerAwareInterface {
* - profiler : Optional callback that takes a section name argument and returns
* a ScopedCallback instance that ends the profile section in its destructor.
* - statusWrapper : Optional callback that is used to wrap returned StatusValues
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
*/
public function __construct( array $config ) {
if ( !array_key_exists( 'name', $config ) ) {
@@ -1293,7 +1303,7 @@ abstract class FileBackend implements LoggerAwareInterface {
* @param array $params Parameters include:
* - dir : storage directory
* - topOnly : only return direct child dirs of the directory
- * @return Traversable|array|null Directory list enumerator or null (initial I/O error)
+ * @return \Traversable|array|null Directory list enumerator or null (initial I/O error)
* @since 1.20
*/
abstract public function getDirectoryList( array $params );
@@ -1311,7 +1321,7 @@ abstract class FileBackend implements LoggerAwareInterface {
*
* @param array $params Parameters include:
* - dir : storage directory
- * @return Traversable|array|null Directory list enumerator or null (initial I/O error)
+ * @return \Traversable|array|null Directory list enumerator or null (initial I/O error)
* @since 1.20
*/
final public function getTopDirectoryList( array $params ) {
@@ -1337,7 +1347,7 @@ abstract class FileBackend implements LoggerAwareInterface {
* - topOnly : only return direct child files of the directory (since 1.20)
* - adviseStat : set to true if stat requests will be made on the files (since 1.22)
* - forWrite : true if the list will inform a write operations (since 1.41)
- * @return Traversable|array|null File list enumerator or null (initial I/O error)
+ * @return \Traversable|array|null File list enumerator or null (initial I/O error)
*/
abstract public function getFileList( array $params );
@@ -1354,7 +1364,7 @@ abstract class FileBackend implements LoggerAwareInterface {
* @param array $params Parameters include:
* - dir : storage directory
* - adviseStat : set to true if stat requests will be made on the files (since 1.22)
- * @return Traversable|array|null File list enumerator or null on failure
+ * @return \Traversable|array|null File list enumerator or null on failure
* @since 1.20
*/
final public function getTopFileList( array $params ) {
@@ -1631,7 +1641,7 @@ abstract class FileBackend implements LoggerAwareInterface {
*
* @param string $type One of (attachment, inline)
* @param string $filename Suggested file name (should not contain slashes)
- * @throws InvalidArgumentException
+ * @throws \InvalidArgumentException
* @return string
* @since 1.20
*/
@@ -1745,3 +1755,5 @@ abstract class FileBackend implements LoggerAwareInterface {
return $this->streamerOptions;
}
}
+/** @deprecated class alias since 1.43 */
+class_alias( FileBackend::class, 'FileBackend' );
diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php b/includes/libs/filebackend/FileBackendMultiWrite.php
index 955c802b3f32..38eb4652cd25 100644
--- a/includes/libs/filebackend/FileBackendMultiWrite.php
+++ b/includes/libs/filebackend/FileBackendMultiWrite.php
@@ -23,6 +23,7 @@
use MediaWiki\Deferred\DeferredUpdates;
use MediaWiki\Json\FormatJson;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
index d625d5554b66..7b93d71fe74d 100644
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -23,6 +23,7 @@
use MediaWiki\Json\FormatJson;
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
diff --git a/includes/libs/filebackend/MemoryFileBackend.php b/includes/libs/filebackend/MemoryFileBackend.php
index 4481d918ea04..aea68d79211f 100644
--- a/includes/libs/filebackend/MemoryFileBackend.php
+++ b/includes/libs/filebackend/MemoryFileBackend.php
@@ -22,6 +22,7 @@
*/
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php
index 4b54345f2b48..72afc7568cbb 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -26,6 +26,7 @@ use MediaWiki\Json\FormatJson;
use MediaWiki\Utils\MWTimestamp;
use Psr\Log\LoggerInterface;
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\RequestTimeout\TimeoutException;
/**
diff --git a/includes/libs/filebackend/fileop/CopyFileOp.php b/includes/libs/filebackend/fileop/CopyFileOp.php
index a60e391ee68a..256aad6b2394 100644
--- a/includes/libs/filebackend/fileop/CopyFileOp.php
+++ b/includes/libs/filebackend/fileop/CopyFileOp.php
@@ -21,6 +21,8 @@
* @ingroup FileBackend
*/
+use Wikimedia\FileBackend\FileBackend;
+
/**
* Copy a file from one storage path to another in the backend.
* Parameters for this operation are outlined in FileBackend::doOperations().
diff --git a/includes/libs/filebackend/fileop/DeleteFileOp.php b/includes/libs/filebackend/fileop/DeleteFileOp.php
index 1c467bbe8f31..bc37ad7c03ae 100644
--- a/includes/libs/filebackend/fileop/DeleteFileOp.php
+++ b/includes/libs/filebackend/fileop/DeleteFileOp.php
@@ -21,6 +21,8 @@
* @ingroup FileBackend
*/
+use Wikimedia\FileBackend\FileBackend;
+
/**
* Delete a file at the given storage path from the backend.
* Parameters for this operation are outlined in FileBackend::doOperations().
diff --git a/includes/libs/filebackend/fileop/DescribeFileOp.php b/includes/libs/filebackend/fileop/DescribeFileOp.php
index 70411963e416..a563d811c95c 100644
--- a/includes/libs/filebackend/fileop/DescribeFileOp.php
+++ b/includes/libs/filebackend/fileop/DescribeFileOp.php
@@ -21,6 +21,8 @@
* @ingroup FileBackend
*/
+use Wikimedia\FileBackend\FileBackend;
+
/**
* Change metadata for a file at the given storage path in the backend.
* Parameters for this operation are outlined in FileBackend::doOperations().
diff --git a/includes/libs/filebackend/fileop/FileOp.php b/includes/libs/filebackend/fileop/FileOp.php
index 781ac06caa24..53f5f0882dfd 100644
--- a/includes/libs/filebackend/fileop/FileOp.php
+++ b/includes/libs/filebackend/fileop/FileOp.php
@@ -23,6 +23,7 @@
use MediaWiki\Json\FormatJson;
use Psr\Log\LoggerInterface;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\RequestTimeout\TimeoutException;
/**
diff --git a/includes/libs/filebackend/fileop/MoveFileOp.php b/includes/libs/filebackend/fileop/MoveFileOp.php
index 8540cfacc9c5..ce4a91ac1ff4 100644
--- a/includes/libs/filebackend/fileop/MoveFileOp.php
+++ b/includes/libs/filebackend/fileop/MoveFileOp.php
@@ -21,6 +21,8 @@
* @ingroup FileBackend
*/
+use Wikimedia\FileBackend\FileBackend;
+
/**
* Move a file from one storage path to another in the backend.
* Parameters for this operation are outlined in FileBackend::doOperations().
diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php
index 4359be36b033..424c831095f6 100644
--- a/includes/media/MediaTransformOutput.php
+++ b/includes/media/MediaTransformOutput.php
@@ -26,6 +26,7 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
use MediaWiki\Status\Status;
use MediaWiki\Xml\Xml;
+use Wikimedia\FileBackend\FileBackend;
/**
* Base class for the output of MediaHandler::doTransform() and File::transform().
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index ae39b08b6e35..4b7698ba6d14 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -37,6 +37,7 @@ use MediaWiki\Title\Title;
use MediaWiki\User\User;
use MediaWiki\User\UserIdentity;
use Wikimedia\AtEase\AtEase;
+use Wikimedia\FileBackend\FileBackend;
/**
* @defgroup Upload Upload related
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 73852b79ba09..736965949976 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -6,6 +6,7 @@ use MediaWiki\Request\WebRequestUpload;
use MediaWiki\Status\Status;
use MediaWiki\User\User;
use Psr\Log\LoggerInterface;
+use Wikimedia\FileBackend\FileBackend;
/**
* Backend for uploading files from chunks.
diff --git a/includes/utils/MWFileProps.php b/includes/utils/MWFileProps.php
index 6cdb8da38c41..c4a40cfa485f 100644
--- a/includes/utils/MWFileProps.php
+++ b/includes/utils/MWFileProps.php
@@ -20,6 +20,8 @@
* @file
*/
+use Wikimedia\FileBackend\FileBackend;
+
/**
* MimeMagic helper wrapper
*
diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php
index 79a60ab53d37..1b43169a687d 100644
--- a/maintenance/copyFileBackend.php
+++ b/maintenance/copyFileBackend.php
@@ -22,6 +22,7 @@
*/
use MediaWiki\Status\Status;
+use Wikimedia\FileBackend\FileBackend;
require_once __DIR__ . '/Maintenance.php';
diff --git a/maintenance/fileOpPerfTest.php b/maintenance/fileOpPerfTest.php
index d4082024860e..c44b2117a3e5 100644
--- a/maintenance/fileOpPerfTest.php
+++ b/maintenance/fileOpPerfTest.php
@@ -21,6 +21,8 @@
* @ingroup Maintenance
*/
+use Wikimedia\FileBackend\FileBackend;
+
require_once __DIR__ . '/Maintenance.php';
/**
diff --git a/maintenance/migrateFileRepoLayout.php b/maintenance/migrateFileRepoLayout.php
index d2d130f24a72..1c29fbabb6f7 100644
--- a/maintenance/migrateFileRepoLayout.php
+++ b/maintenance/migrateFileRepoLayout.php
@@ -21,6 +21,8 @@
* @ingroup Maintenance
*/
+use Wikimedia\FileBackend\FileBackend;
+
require_once __DIR__ . '/Maintenance.php';
/**
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 7cc13106b028..accffc173147 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -52,6 +52,7 @@ use MediaWiki\Utils\MWTimestamp;
use MediaWiki\WikiMap\WikiMap;
use Psr\Log\NullLogger;
use Wikimedia\Assert\Assert;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\Parsoid\Config\PageConfig;
use Wikimedia\Parsoid\Config\SiteConfig;
use Wikimedia\Parsoid\Core\LinkTarget as ParsoidLinkTarget;
diff --git a/tests/phpunit/includes/filebackend/FileBackendStoreTest.php b/tests/phpunit/includes/filebackend/FileBackendStoreTest.php
index 88e94a0e5642..128944d7abf5 100644
--- a/tests/phpunit/includes/filebackend/FileBackendStoreTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendStoreTest.php
@@ -2,9 +2,9 @@
namespace phpunit\includes\filebackend;
-use FileBackend;
use MediaWikiIntegrationTestCase;
use MemoryFileBackend;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\TestingAccessWrapper;
/**
diff --git a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
index b99fd806a986..fb75699a8ebd 100644
--- a/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Logger\LoggerFactory;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\TestingAccessWrapper;
/**
diff --git a/tests/phpunit/includes/media/ThumbnailImageTest.php b/tests/phpunit/includes/media/ThumbnailImageTest.php
index 30ec297fceba..2af643468657 100644
--- a/tests/phpunit/includes/media/ThumbnailImageTest.php
+++ b/tests/phpunit/includes/media/ThumbnailImageTest.php
@@ -1,5 +1,7 @@
<?php
+use Wikimedia\FileBackend\FileBackend;
+
/**
* @group Media
* @group medium
diff --git a/tests/phpunit/integration/includes/libs/filebackend/FSFileBackendIntegrationTest.php b/tests/phpunit/integration/includes/libs/filebackend/FSFileBackendIntegrationTest.php
index 9ba0ee1296cb..2be7ca0f043b 100644
--- a/tests/phpunit/integration/includes/libs/filebackend/FSFileBackendIntegrationTest.php
+++ b/tests/phpunit/integration/includes/libs/filebackend/FSFileBackendIntegrationTest.php
@@ -8,7 +8,7 @@ use MediaWiki\WikiMap\WikiMap;
* @group FileBackend
* @group medium
*
- * @covers \FileBackend
+ * @covers \Wikimedia\FileBackend\FileBackend
*
* @covers \CopyFileOp
* @covers \CreateFileOp
diff --git a/tests/phpunit/integration/includes/libs/filebackend/FileBackendIntegrationTestBase.php b/tests/phpunit/integration/includes/libs/filebackend/FileBackendIntegrationTestBase.php
index 865b771ec634..31912bd78f1a 100644
--- a/tests/phpunit/integration/includes/libs/filebackend/FileBackendIntegrationTestBase.php
+++ b/tests/phpunit/integration/includes/libs/filebackend/FileBackendIntegrationTestBase.php
@@ -1,6 +1,7 @@
<?php
use MediaWiki\Status\Status;
+use Wikimedia\FileBackend\FileBackend;
abstract class FileBackendIntegrationTestBase extends MediaWikiIntegrationTestCase {
diff --git a/tests/phpunit/integration/includes/utils/MWFilePropsTest.php b/tests/phpunit/integration/includes/utils/MWFilePropsTest.php
index 57f799d979c5..2c0330099842 100644
--- a/tests/phpunit/integration/includes/utils/MWFilePropsTest.php
+++ b/tests/phpunit/integration/includes/utils/MWFilePropsTest.php
@@ -1,5 +1,7 @@
<?php
+use Wikimedia\FileBackend\FileBackend;
+
/**
* @covers \MWFileProps
*/
diff --git a/tests/phpunit/mocks/filerepo/TestRepoTrait.php b/tests/phpunit/mocks/filerepo/TestRepoTrait.php
index f525d6faad38..9b06e1a82085 100644
--- a/tests/phpunit/mocks/filerepo/TestRepoTrait.php
+++ b/tests/phpunit/mocks/filerepo/TestRepoTrait.php
@@ -2,7 +2,6 @@
namespace MediaWiki\Tests\FileRepo;
-use FileBackend;
use FileBackendGroup;
use FSFileBackend;
use LocalRepo;
@@ -11,6 +10,7 @@ use MediaWiki\MediaWikiServices;
use PHPUnit\Framework\Assert;
use RepoGroup;
use Title;
+use Wikimedia\FileBackend\FileBackend;
trait TestRepoTrait {
diff --git a/tests/phpunit/unit/includes/libs/filebackend/FileBackendTest.php b/tests/phpunit/unit/includes/libs/filebackend/FileBackendTest.php
index 1bd7345d5077..55242995cbf7 100644
--- a/tests/phpunit/unit/includes/libs/filebackend/FileBackendTest.php
+++ b/tests/phpunit/unit/includes/libs/filebackend/FileBackendTest.php
@@ -5,7 +5,6 @@ declare( strict_types = 1 );
namespace Wikimedia\Tests\FileBackend;
use Closure;
-use FileBackend;
use InvalidArgumentException;
use LockManager;
use MediaWiki\FileBackend\FSFile\TempFSFileFactory;
@@ -14,11 +13,12 @@ use PHPUnit\Framework\MockObject\MockObject;
use Psr\Log\NullLogger;
use ScopedLock;
use StatusValue;
+use Wikimedia\FileBackend\FileBackend;
use Wikimedia\ScopedCallback;
use Wikimedia\TestingAccessWrapper;
/**
- * @covers \FileBackend
+ * @covers \Wikimedia\FileBackend\FileBackend
*/
class FileBackendTest extends MediaWikiUnitTestCase {
/**