From 7dcc449087363fe77ec3c603e347603d7527e7fc Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:45:00 -0400 Subject: [PATCH 01/18] test(ObjectStore): establish StorageBackedObjectStore Replaces class StorageObjectStore that currently exits in production code but is purely a test support class and renames it to make use-case somewhat clearer. Signed-off-by: Josh --- .../ObjectStore/StorageBackedObjectStore.php | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 tests/lib/Files/ObjectStore/StorageBackedObjectStore.php diff --git a/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php b/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php new file mode 100644 index 0000000000000..3bab16a760204 --- /dev/null +++ b/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php @@ -0,0 +1,76 @@ +storage->getId(); + } + + /** + * @param string $urn the unified resource name used to identify the object + * @return resource stream with the read data + * @throws \Exception when something goes wrong, message will be logged + * @since 7.0.0 + */ + public function readObject($urn) { + $handle = $this->storage->fopen($urn, 'r'); + if (is_resource($handle)) { + return $handle; + } + + throw new \Exception(); + } + + public function writeObject($urn, $stream, ?string $mimetype = null) { + $handle = $this->storage->fopen($urn, 'w'); + if ($handle) { + stream_copy_to_stream($stream, $handle); + fclose($handle); + } else { + throw new \Exception(); + } + } + + /** + * @param string $urn the unified resource name used to identify the object + * @return void + * @throws \Exception when something goes wrong, message will be logged + * @since 7.0.0 + */ + public function deleteObject($urn) { + $this->storage->unlink($urn); + } + + public function objectExists($urn) { + return $this->storage->file_exists($urn); + } + + public function copyObject($from, $to) { + $this->storage->copy($from, $to); + } + + public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string { + return null; + } +} From 6aa265819a49d5b86a2120df1bfbc50d03bb0ea1 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:46:43 -0400 Subject: [PATCH 02/18] chore(ObjectStore): delete StorageObjectStore Replaced with test-only class StorageBackedObjectStore Signed-off-by: Josh --- .../Files/ObjectStore/StorageObjectStore.php | 76 ------------------- 1 file changed, 76 deletions(-) delete mode 100644 lib/private/Files/ObjectStore/StorageObjectStore.php diff --git a/lib/private/Files/ObjectStore/StorageObjectStore.php b/lib/private/Files/ObjectStore/StorageObjectStore.php deleted file mode 100644 index f170116a3a6e8..0000000000000 --- a/lib/private/Files/ObjectStore/StorageObjectStore.php +++ /dev/null @@ -1,76 +0,0 @@ -storage->getId(); - } - - /** - * @param string $urn the unified resource name used to identify the object - * @return resource stream with the read data - * @throws \Exception when something goes wrong, message will be logged - * @since 7.0.0 - */ - public function readObject($urn) { - $handle = $this->storage->fopen($urn, 'r'); - if (is_resource($handle)) { - return $handle; - } - - throw new \Exception(); - } - - public function writeObject($urn, $stream, ?string $mimetype = null) { - $handle = $this->storage->fopen($urn, 'w'); - if ($handle) { - stream_copy_to_stream($stream, $handle); - fclose($handle); - } else { - throw new \Exception(); - } - } - - /** - * @param string $urn the unified resource name used to identify the object - * @return void - * @throws \Exception when something goes wrong, message will be logged - * @since 7.0.0 - */ - public function deleteObject($urn) { - $this->storage->unlink($urn); - } - - public function objectExists($urn) { - return $this->storage->file_exists($urn); - } - - public function copyObject($from, $to) { - $this->storage->copy($from, $to); - } - - public function preSignedUrl(string $urn, \DateTimeInterface $expiration): ?string { - return null; - } -} From 2be19ea75881d3fe673ac476895c08463272b170 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:48:52 -0400 Subject: [PATCH 03/18] chore(OO): change to test namespace Signed-off-by: Josh --- tests/lib/Files/ObjectStore/StorageBackedObjectStore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php b/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php index 3bab16a760204..65a7f9aa97583 100644 --- a/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php +++ b/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php @@ -4,7 +4,7 @@ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OC\Files\ObjectStore; +namespace Test\Files\ObjectStore; use OCP\Files\ObjectStore\IObjectStore; use OCP\Files\Storage\IStorage; From 74cb706f9ba4493c1d86f8b397031ea2c84551c4 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:51:58 -0400 Subject: [PATCH 04/18] chore: switch LocalTest to StorageBackedObjectStore Signed-off-by: Josh --- tests/lib/Files/ObjectStore/LocalTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/lib/Files/ObjectStore/LocalTest.php b/tests/lib/Files/ObjectStore/LocalTest.php index f66114966a0d7..dfe30c0813d06 100644 --- a/tests/lib/Files/ObjectStore/LocalTest.php +++ b/tests/lib/Files/ObjectStore/LocalTest.php @@ -8,9 +8,9 @@ */ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; +use Tests\Files\ObjectStore\StorageBackedObjectStore; class LocalTest extends ObjectStoreTestCase { /** @@ -18,6 +18,6 @@ class LocalTest extends ObjectStoreTestCase { */ protected function getInstance() { $storage = new Temporary(); - return new StorageObjectStore($storage); + return new StorageBackedObjectStore($storage); } } From edb9895e433a520c57239217084d2706eb60ae3f Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:53:49 -0400 Subject: [PATCH 05/18] chore: switch ObjectStoreStorageTest to StorageBackedObjectStore Signed-off-by: Josh --- tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index fd9eddcdb45ce..a49344cb27b1f 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -8,11 +8,11 @@ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OC\Files\Storage\Wrapper\Jail; use OCP\Constants; use OCP\Files\ObjectStore\IObjectStore; +use Test\Files\ObjectStore\StorageBackedObjectStore; use Test\Files\Storage\Storage; #[\PHPUnit\Framework\Attributes\Group('DB')] From 1c75f2d082197c6391a0de130232b80e5cd549fb Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:54:43 -0400 Subject: [PATCH 06/18] chore: switch ObjectStoreStoragesSameBucketTest to StorageBackedObjectStore Signed-off-by: Josh --- .../Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php index b1a8de107161c..06d035558b4a5 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php @@ -9,10 +9,10 @@ */ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; +use Test\Files\ObjectStore\StorageBackedObjectStore; #[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStoragesSameBucketTest extends StoragesTestCase { @@ -25,7 +25,7 @@ protected function setUp(): void { parent::setUp(); $baseStorage = new Temporary(); - $this->objectStore = new StorageObjectStore($baseStorage); + $this->objectStore = new StorageBackedObjectStore($baseStorage); $config['objectstore'] = $this->objectStore; // storage1 and storage2 share the same object store. $this->storage1 = new ObjectStoreStorageOverwrite($config); From 0d0d7004b18c33ca476fa68765381de51ac96755 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:55:43 -0400 Subject: [PATCH 07/18] chore: switch ObjectStoreStoragesDifferentBucketTest to StorageBackedObjectStore Signed-off-by: Josh --- .../ObjectStore/ObjectStoreStoragesDifferentBucketTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php index 37cb8f47f2f7e..05d18362451f3 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php @@ -9,10 +9,10 @@ */ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; +use Test\Files\ObjectStore\StorageBackedObjectStore; #[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStoragesDifferentBucketTest extends StoragesTestCase { @@ -30,12 +30,12 @@ protected function setUp(): void { parent::setUp(); $baseStorage1 = new Temporary(); - $this->objectStore1 = new StorageObjectStore($baseStorage1); + $this->objectStore1 = new StorageBackedObjectStore($baseStorage1); $config['objectstore'] = $this->objectStore1; $this->storage1 = new ObjectStoreStorageOverwrite($config); $baseStorage2 = new Temporary(); - $this->objectStore2 = new StorageObjectStore($baseStorage2); + $this->objectStore2 = new StorageBackedObjectStore($baseStorage2); $config['objectstore'] = $this->objectStore2; $this->storage2 = new ObjectStoreStorageOverwrite($config); } From 02d1dbd3e22fa5af2c9cf647925a643b411ead26 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 21:57:36 -0400 Subject: [PATCH 08/18] chore: switch UpdaterTest to StorageBackedObjectStore Signed-off-by: Josh --- tests/lib/Files/Cache/UpdaterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/lib/Files/Cache/UpdaterTest.php b/tests/lib/Files/Cache/UpdaterTest.php index 94fa42d64a417..4edb478fc61a6 100644 --- a/tests/lib/Files/Cache/UpdaterTest.php +++ b/tests/lib/Files/Cache/UpdaterTest.php @@ -12,11 +12,11 @@ use OC\Files\Cache\Updater; use OC\Files\Filesystem; use OC\Files\ObjectStore\ObjectStoreStorage; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Storage; use OC\Files\Storage\Temporary; use OC\Files\View; use OCP\Files\Storage\IStorage; +use Test\Files\ObjectStore\StorageBackedObjectStore; /** * Class UpdaterTest @@ -313,7 +313,7 @@ public function testMoveFolderCrossStorage(): void { public static function changeExtensionProvider(): array { return [ [new Temporary()], - [new ObjectStoreStorage(['objectstore' => new StorageObjectStore(new Temporary())])] + [new ObjectStoreStorage(['objectstore' => new StorageBackedObjectStore(new Temporary())])] ]; } From a9eef0a0621da8fc14057c865edef1a9a6662000 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 22:02:07 -0400 Subject: [PATCH 09/18] chore: switch PrimaryObjectStoreConfigTest to StorageBackedObjectStore Signed-off-by: Josh --- .../PrimaryObjectStoreConfigTest.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php b/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php index 07e58d56f11b9..b3d0eb71d522b 100644 --- a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php +++ b/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php @@ -9,12 +9,12 @@ namespace lib\Files\ObjectStore; use OC\Files\ObjectStore\PrimaryObjectStoreConfig; -use OC\Files\ObjectStore\StorageObjectStore; use OCP\App\IAppManager; use OCP\IConfig; use OCP\IUser; use PHPUnit\Framework\MockObject\MockObject; use Test\TestCase; +use Test\Files\ObjectStore\StorageBackedObjectStore; class PrimaryObjectStoreConfigTest extends TestCase { private array $systemConfig = []; @@ -68,7 +68,7 @@ public function testNewUserGetsDefault() { $this->setConfig('objectstore', [ 'default' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', ], @@ -88,14 +88,14 @@ public function testExistingUserKeepsStorage() { $this->setConfig('objectstore', [ 'default' => 'server2', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'bucket' => '1', ], ], 'server2' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server2', 'bucket' => '2', @@ -118,7 +118,7 @@ public function testNestedAliases() { 'a1' => 'a2', 'a2' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'bucket' => '1', @@ -132,7 +132,7 @@ public function testMultibucketChangedConfig() { $this->setConfig('objectstore', [ 'default' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'multibucket' => true, @@ -149,7 +149,7 @@ public function testMultibucketChangedConfig() { $this->setConfig('objectstore', [ 'default' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'multibucket' => true, @@ -170,7 +170,7 @@ public function testMultibucketChangedConfig() { $this->setConfig('objectstore', [ 'default' => 'server2', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'multibucket' => true, @@ -179,7 +179,7 @@ public function testMultibucketChangedConfig() { ], ], 'server2' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server2', 'multibucket' => true, @@ -200,7 +200,7 @@ public function testMultibucketChangedConfig() { public function testMultibucketOldConfig() { $this->setConfig('objectstore_multibucket', [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'multibucket' => true, @@ -214,7 +214,7 @@ public function testMultibucketOldConfig() { 'root' => 'server1', 'preview' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'multibucket' => true, @@ -227,7 +227,7 @@ public function testMultibucketOldConfig() { public function testSingleObjectStore() { $this->setConfig('objectstore', [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', ], @@ -238,7 +238,7 @@ public function testSingleObjectStore() { 'root' => 'server1', 'preview' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'multibucket' => false, @@ -251,14 +251,14 @@ public function testRoot() { $this->setConfig('objectstore', [ 'default' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'bucket' => '1', ], ], 'server2' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server2', 'bucket' => '2', @@ -274,14 +274,14 @@ public function testRoot() { 'root' => 'server2', 'preview' => 'server1', 'server1' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server1', 'bucket' => '1', ], ], 'server2' => [ - 'class' => StorageObjectStore::class, + 'class' => StorageBackedObjectStore::class, 'arguments' => [ 'host' => 'server2', 'bucket' => '2', From fb5f98c585b2c1f85ea5b525bf18edf3944d1042 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 22:04:16 -0400 Subject: [PATCH 10/18] chore: drop StorageObjectStore from prod autoload_static.php Signed-off-by: Josh --- lib/composer/composer/autoload_static.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 79c4de8f32767..4b481797521fb 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1824,7 +1824,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Files\\ObjectStore\\S3ConnectionTrait' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/S3ConnectionTrait.php', 'OC\\Files\\ObjectStore\\S3ObjectTrait' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/S3ObjectTrait.php', 'OC\\Files\\ObjectStore\\S3Signature' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/S3Signature.php', - 'OC\\Files\\ObjectStore\\StorageObjectStore' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/StorageObjectStore.php', 'OC\\Files\\ObjectStore\\Swift' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Swift.php', 'OC\\Files\\ObjectStore\\SwiftFactory' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/SwiftFactory.php', 'OC\\Files\\ObjectStore\\SwiftV2CachingAuthService' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php', From d5acfff5c03a44509aa1908e8bab6c1d7b353530 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 22:05:01 -0400 Subject: [PATCH 11/18] chore: drop StorageObjectStore from prod autoload_classmap Signed-off-by: Josh --- lib/composer/composer/autoload_classmap.php | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 35992e16837d2..5a54d5cce1a56 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1783,7 +1783,6 @@ 'OC\\Files\\ObjectStore\\S3ConnectionTrait' => $baseDir . '/lib/private/Files/ObjectStore/S3ConnectionTrait.php', 'OC\\Files\\ObjectStore\\S3ObjectTrait' => $baseDir . '/lib/private/Files/ObjectStore/S3ObjectTrait.php', 'OC\\Files\\ObjectStore\\S3Signature' => $baseDir . '/lib/private/Files/ObjectStore/S3Signature.php', - 'OC\\Files\\ObjectStore\\StorageObjectStore' => $baseDir . '/lib/private/Files/ObjectStore/StorageObjectStore.php', 'OC\\Files\\ObjectStore\\Swift' => $baseDir . '/lib/private/Files/ObjectStore/Swift.php', 'OC\\Files\\ObjectStore\\SwiftFactory' => $baseDir . '/lib/private/Files/ObjectStore/SwiftFactory.php', 'OC\\Files\\ObjectStore\\SwiftV2CachingAuthService' => $baseDir . '/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php', From c10aa29617071ea35703ac207191249759bcc7bd Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 22:13:29 -0400 Subject: [PATCH 12/18] chore: fixup ObjectStoreStorageTest to really new StorageBackedObjectStore Signed-off-by: Josh --- tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index a49344cb27b1f..7f9ad9f8c0a7b 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -29,7 +29,7 @@ protected function setUp(): void { parent::setUp(); $baseStorage = new Temporary(); - $this->objectStorage = new StorageObjectStore($baseStorage); + $this->objectStorage = new StorageBackedObjectStore($baseStorage); $config['objectstore'] = $this->objectStorage; $this->instance = new ObjectStoreStorageOverwrite($config); } From 6064165fd747bc414f535d270946e409ea44792b Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 27 Mar 2026 22:34:03 -0400 Subject: [PATCH 13/18] chore: fixup LocalTest to import from correct ns Signed-off-by: Josh --- tests/lib/Files/ObjectStore/LocalTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/LocalTest.php b/tests/lib/Files/ObjectStore/LocalTest.php index dfe30c0813d06..f9e8cd374f0c4 100644 --- a/tests/lib/Files/ObjectStore/LocalTest.php +++ b/tests/lib/Files/ObjectStore/LocalTest.php @@ -10,7 +10,7 @@ use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; -use Tests\Files\ObjectStore\StorageBackedObjectStore; +use Test\Files\ObjectStore\StorageBackedObjectStore; class LocalTest extends ObjectStoreTestCase { /** From 07e0a49df6189da9012ad8662bff6008a6fe84b3 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 28 Mar 2026 07:44:40 -0400 Subject: [PATCH 14/18] chore: drop no longer necessary import Signed-off-by: Josh --- tests/lib/Files/ObjectStore/LocalTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/LocalTest.php b/tests/lib/Files/ObjectStore/LocalTest.php index f9e8cd374f0c4..75b8cce486cb0 100644 --- a/tests/lib/Files/ObjectStore/LocalTest.php +++ b/tests/lib/Files/ObjectStore/LocalTest.php @@ -10,7 +10,6 @@ use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; -use Test\Files\ObjectStore\StorageBackedObjectStore; class LocalTest extends ObjectStoreTestCase { /** From d67cb449a9c60bb482d684b8741e05b836424793 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 28 Mar 2026 07:45:23 -0400 Subject: [PATCH 15/18] chore: drop no longer necessary import Signed-off-by: Josh --- .../Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php index 05d18362451f3..74395b2d53c1f 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php @@ -12,7 +12,6 @@ use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; -use Test\Files\ObjectStore\StorageBackedObjectStore; #[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStoragesDifferentBucketTest extends StoragesTestCase { From 1619673325b8b1321c9fadedd4e6529d66c34dc3 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 28 Mar 2026 07:45:46 -0400 Subject: [PATCH 16/18] chore: drop no longer necessary import Signed-off-by: Josh --- .../lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php index 06d035558b4a5..f9d133c4b31a5 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php @@ -12,7 +12,6 @@ use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; -use Test\Files\ObjectStore\StorageBackedObjectStore; #[\PHPUnit\Framework\Attributes\Group('DB')] class ObjectStoreStoragesSameBucketTest extends StoragesTestCase { From 5ec1fd31155f06c960b26a7d9f7e213b4c514e8a Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 28 Mar 2026 07:46:15 -0400 Subject: [PATCH 17/18] chore: drop no longer necessary import Signed-off-by: Josh --- tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index 7f9ad9f8c0a7b..c9a9d376b6f8d 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -12,7 +12,6 @@ use OC\Files\Storage\Wrapper\Jail; use OCP\Constants; use OCP\Files\ObjectStore\IObjectStore; -use Test\Files\ObjectStore\StorageBackedObjectStore; use Test\Files\Storage\Storage; #[\PHPUnit\Framework\Attributes\Group('DB')] From d182f6fb11384f107ef2396fe29d7ded46402582 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 28 Mar 2026 07:47:47 -0400 Subject: [PATCH 18/18] chore: make cs happy Signed-off-by: Josh --- tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php b/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php index b3d0eb71d522b..6fa7fc9c74cc7 100644 --- a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php +++ b/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php @@ -13,8 +13,8 @@ use OCP\IConfig; use OCP\IUser; use PHPUnit\Framework\MockObject\MockObject; -use Test\TestCase; use Test\Files\ObjectStore\StorageBackedObjectStore; +use Test\TestCase; class PrimaryObjectStoreConfigTest extends TestCase { private array $systemConfig = [];