From 950c1c32467c64b87416a00b65ee2caf2f0e2580 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 15 Apr 2019 02:30:24 -0700 Subject: [PATCH] filebackend: move more files to subdirectories Change-Id: If965323809c5bfc9cb73ed0f357233d9325d3353 --- autoload.php | 26 +++++++++---------- .../{ => exception}/FileBackendError.php | 0 .../FSFileBackendDirList.php | 0 .../FSFileBackendFileList.php | 0 .../{ => fileiteration}/FSFileBackendList.php | 0 .../FileBackendStoreShardDirIterator.php | 0 .../FileBackendStoreShardFileIterator.php | 0 .../FileBackendStoreShardListIterator.php | 0 .../SwiftFileBackendDirList.php | 0 .../SwiftFileBackendFileList.php | 0 .../SwiftFileBackendList.php | 0 .../{ => fileophandle}/FSFileOpHandle.php | 0 .../FileBackendStoreOpHandle.php | 0 .../{ => fileophandle}/SwiftFileOpHandle.php | 0 14 files changed, 13 insertions(+), 13 deletions(-) rename includes/libs/filebackend/{ => exception}/FileBackendError.php (100%) rename includes/libs/filebackend/{ => fileiteration}/FSFileBackendDirList.php (100%) rename includes/libs/filebackend/{ => fileiteration}/FSFileBackendFileList.php (100%) rename includes/libs/filebackend/{ => fileiteration}/FSFileBackendList.php (100%) rename includes/libs/filebackend/{ => fileiteration}/FileBackendStoreShardDirIterator.php (100%) rename includes/libs/filebackend/{ => fileiteration}/FileBackendStoreShardFileIterator.php (100%) rename includes/libs/filebackend/{ => fileiteration}/FileBackendStoreShardListIterator.php (100%) rename includes/libs/filebackend/{ => fileiteration}/SwiftFileBackendDirList.php (100%) rename includes/libs/filebackend/{ => fileiteration}/SwiftFileBackendFileList.php (100%) rename includes/libs/filebackend/{ => fileiteration}/SwiftFileBackendList.php (100%) rename includes/libs/filebackend/{ => fileophandle}/FSFileOpHandle.php (100%) rename includes/libs/filebackend/{ => fileophandle}/FileBackendStoreOpHandle.php (100%) rename includes/libs/filebackend/{ => fileophandle}/SwiftFileOpHandle.php (100%) diff --git a/autoload.php b/autoload.php index f1668a1e9d..ab36d84157 100644 --- a/autoload.php +++ b/autoload.php @@ -487,10 +487,10 @@ $wgAutoloadLocalClasses = [ 'ExternalUserNames' => __DIR__ . '/includes/user/ExternalUserNames.php', 'FSFile' => __DIR__ . '/includes/libs/filebackend/fsfile/FSFile.php', 'FSFileBackend' => __DIR__ . '/includes/libs/filebackend/FSFileBackend.php', - 'FSFileBackendDirList' => __DIR__ . '/includes/libs/filebackend/FSFileBackendDirList.php', - 'FSFileBackendFileList' => __DIR__ . '/includes/libs/filebackend/FSFileBackendFileList.php', - 'FSFileBackendList' => __DIR__ . '/includes/libs/filebackend/FSFileBackendList.php', - 'FSFileOpHandle' => __DIR__ . '/includes/libs/filebackend/FSFileOpHandle.php', + 'FSFileBackendDirList' => __DIR__ . '/includes/libs/filebackend/fileiteration/FSFileBackendDirList.php', + 'FSFileBackendFileList' => __DIR__ . '/includes/libs/filebackend/fileiteration/FSFileBackendFileList.php', + 'FSFileBackendList' => __DIR__ . '/includes/libs/filebackend/fileiteration/FSFileBackendList.php', + 'FSFileOpHandle' => __DIR__ . '/includes/libs/filebackend/fileophandle/FSFileOpHandle.php', 'FSLockManager' => __DIR__ . '/includes/libs/lockmanager/FSLockManager.php', 'FakeConverter' => __DIR__ . '/languages/FakeConverter.php', 'FakeMaintenance' => __DIR__ . '/maintenance/Maintenance.php', @@ -507,14 +507,14 @@ $wgAutoloadLocalClasses = [ 'FileAwareNodeVisitor' => __DIR__ . '/maintenance/findDeprecated.php', 'FileBackend' => __DIR__ . '/includes/libs/filebackend/FileBackend.php', 'FileBackendDBRepoWrapper' => __DIR__ . '/includes/filerepo/FileBackendDBRepoWrapper.php', - 'FileBackendError' => __DIR__ . '/includes/libs/filebackend/FileBackendError.php', + 'FileBackendError' => __DIR__ . '/includes/libs/filebackend/exception/FileBackendError.php', 'FileBackendGroup' => __DIR__ . '/includes/filebackend/FileBackendGroup.php', 'FileBackendMultiWrite' => __DIR__ . '/includes/libs/filebackend/FileBackendMultiWrite.php', 'FileBackendStore' => __DIR__ . '/includes/libs/filebackend/FileBackendStore.php', - 'FileBackendStoreOpHandle' => __DIR__ . '/includes/libs/filebackend/FileBackendStoreOpHandle.php', - 'FileBackendStoreShardDirIterator' => __DIR__ . '/includes/libs/filebackend/FileBackendStoreShardDirIterator.php', - 'FileBackendStoreShardFileIterator' => __DIR__ . '/includes/libs/filebackend/FileBackendStoreShardFileIterator.php', - 'FileBackendStoreShardListIterator' => __DIR__ . '/includes/libs/filebackend/FileBackendStoreShardListIterator.php', + 'FileBackendStoreOpHandle' => __DIR__ . '/includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php', + 'FileBackendStoreShardDirIterator' => __DIR__ . '/includes/libs/filebackend/fileiteration/FileBackendStoreShardDirIterator.php', + 'FileBackendStoreShardFileIterator' => __DIR__ . '/includes/libs/filebackend/fileiteration/FileBackendStoreShardFileIterator.php', + 'FileBackendStoreShardListIterator' => __DIR__ . '/includes/libs/filebackend/fileiteration/FileBackendStoreShardListIterator.php', 'FileBasedSiteLookup' => __DIR__ . '/includes/site/FileBasedSiteLookup.php', 'FileCacheBase' => __DIR__ . '/includes/cache/FileCacheBase.php', 'FileContentHandler' => __DIR__ . '/includes/content/FileContentHandler.php', @@ -1455,10 +1455,10 @@ $wgAutoloadLocalClasses = [ 'SubpageImportTitleFactory' => __DIR__ . '/includes/title/SubpageImportTitleFactory.php', 'SvgHandler' => __DIR__ . '/includes/media/SvgHandler.php', 'SwiftFileBackend' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackend.php', - 'SwiftFileBackendDirList' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackendDirList.php', - 'SwiftFileBackendFileList' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackendFileList.php', - 'SwiftFileBackendList' => __DIR__ . '/includes/libs/filebackend/SwiftFileBackendList.php', - 'SwiftFileOpHandle' => __DIR__ . '/includes/libs/filebackend/SwiftFileOpHandle.php', + 'SwiftFileBackendDirList' => __DIR__ . '/includes/libs/filebackend/fileiteration/SwiftFileBackendDirList.php', + 'SwiftFileBackendFileList' => __DIR__ . '/includes/libs/filebackend/fileiteration/SwiftFileBackendFileList.php', + 'SwiftFileBackendList' => __DIR__ . '/includes/libs/filebackend/fileiteration/SwiftFileBackendList.php', + 'SwiftFileOpHandle' => __DIR__ . '/includes/libs/filebackend/fileophandle/SwiftFileOpHandle.php', 'SwiftVirtualRESTService' => __DIR__ . '/includes/libs/virtualrest/SwiftVirtualRESTService.php', 'SyncFileBackend' => __DIR__ . '/maintenance/syncFileBackend.php', 'TableCleanup' => __DIR__ . '/maintenance/cleanupTable.inc', diff --git a/includes/libs/filebackend/FileBackendError.php b/includes/libs/filebackend/exception/FileBackendError.php similarity index 100% rename from includes/libs/filebackend/FileBackendError.php rename to includes/libs/filebackend/exception/FileBackendError.php diff --git a/includes/libs/filebackend/FSFileBackendDirList.php b/includes/libs/filebackend/fileiteration/FSFileBackendDirList.php similarity index 100% rename from includes/libs/filebackend/FSFileBackendDirList.php rename to includes/libs/filebackend/fileiteration/FSFileBackendDirList.php diff --git a/includes/libs/filebackend/FSFileBackendFileList.php b/includes/libs/filebackend/fileiteration/FSFileBackendFileList.php similarity index 100% rename from includes/libs/filebackend/FSFileBackendFileList.php rename to includes/libs/filebackend/fileiteration/FSFileBackendFileList.php diff --git a/includes/libs/filebackend/FSFileBackendList.php b/includes/libs/filebackend/fileiteration/FSFileBackendList.php similarity index 100% rename from includes/libs/filebackend/FSFileBackendList.php rename to includes/libs/filebackend/fileiteration/FSFileBackendList.php diff --git a/includes/libs/filebackend/FileBackendStoreShardDirIterator.php b/includes/libs/filebackend/fileiteration/FileBackendStoreShardDirIterator.php similarity index 100% rename from includes/libs/filebackend/FileBackendStoreShardDirIterator.php rename to includes/libs/filebackend/fileiteration/FileBackendStoreShardDirIterator.php diff --git a/includes/libs/filebackend/FileBackendStoreShardFileIterator.php b/includes/libs/filebackend/fileiteration/FileBackendStoreShardFileIterator.php similarity index 100% rename from includes/libs/filebackend/FileBackendStoreShardFileIterator.php rename to includes/libs/filebackend/fileiteration/FileBackendStoreShardFileIterator.php diff --git a/includes/libs/filebackend/FileBackendStoreShardListIterator.php b/includes/libs/filebackend/fileiteration/FileBackendStoreShardListIterator.php similarity index 100% rename from includes/libs/filebackend/FileBackendStoreShardListIterator.php rename to includes/libs/filebackend/fileiteration/FileBackendStoreShardListIterator.php diff --git a/includes/libs/filebackend/SwiftFileBackendDirList.php b/includes/libs/filebackend/fileiteration/SwiftFileBackendDirList.php similarity index 100% rename from includes/libs/filebackend/SwiftFileBackendDirList.php rename to includes/libs/filebackend/fileiteration/SwiftFileBackendDirList.php diff --git a/includes/libs/filebackend/SwiftFileBackendFileList.php b/includes/libs/filebackend/fileiteration/SwiftFileBackendFileList.php similarity index 100% rename from includes/libs/filebackend/SwiftFileBackendFileList.php rename to includes/libs/filebackend/fileiteration/SwiftFileBackendFileList.php diff --git a/includes/libs/filebackend/SwiftFileBackendList.php b/includes/libs/filebackend/fileiteration/SwiftFileBackendList.php similarity index 100% rename from includes/libs/filebackend/SwiftFileBackendList.php rename to includes/libs/filebackend/fileiteration/SwiftFileBackendList.php diff --git a/includes/libs/filebackend/FSFileOpHandle.php b/includes/libs/filebackend/fileophandle/FSFileOpHandle.php similarity index 100% rename from includes/libs/filebackend/FSFileOpHandle.php rename to includes/libs/filebackend/fileophandle/FSFileOpHandle.php diff --git a/includes/libs/filebackend/FileBackendStoreOpHandle.php b/includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php similarity index 100% rename from includes/libs/filebackend/FileBackendStoreOpHandle.php rename to includes/libs/filebackend/fileophandle/FileBackendStoreOpHandle.php diff --git a/includes/libs/filebackend/SwiftFileOpHandle.php b/includes/libs/filebackend/fileophandle/SwiftFileOpHandle.php similarity index 100% rename from includes/libs/filebackend/SwiftFileOpHandle.php rename to includes/libs/filebackend/fileophandle/SwiftFileOpHandle.php -- 2.20.1