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', 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', 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())])] ]; } diff --git a/tests/lib/Files/ObjectStore/LocalTest.php b/tests/lib/Files/ObjectStore/LocalTest.php index f66114966a0d7..75b8cce486cb0 100644 --- a/tests/lib/Files/ObjectStore/LocalTest.php +++ b/tests/lib/Files/ObjectStore/LocalTest.php @@ -8,7 +8,6 @@ */ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; @@ -18,6 +17,6 @@ class LocalTest extends ObjectStoreTestCase { */ protected function getInstance() { $storage = new Temporary(); - return new StorageObjectStore($storage); + return new StorageBackedObjectStore($storage); } } diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index fd9eddcdb45ce..c9a9d376b6f8d 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -8,7 +8,6 @@ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OC\Files\Storage\Wrapper\Jail; use OCP\Constants; @@ -29,7 +28,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); } diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php index 37cb8f47f2f7e..74395b2d53c1f 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php @@ -9,7 +9,6 @@ */ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; @@ -30,12 +29,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); } diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php index b1a8de107161c..f9d133c4b31a5 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php @@ -9,7 +9,6 @@ */ namespace Test\Files\ObjectStore; -use OC\Files\ObjectStore\StorageObjectStore; use OC\Files\Storage\Temporary; use OCP\Files\ObjectStore\IObjectStore; use Test\Files\Storage\StoragesTestCase; @@ -25,7 +24,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); diff --git a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php b/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php index 07e58d56f11b9..6fa7fc9c74cc7 100644 --- a/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php +++ b/tests/lib/Files/ObjectStore/PrimaryObjectStoreConfigTest.php @@ -9,11 +9,11 @@ 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\Files\ObjectStore\StorageBackedObjectStore; use Test\TestCase; class PrimaryObjectStoreConfigTest extends TestCase { @@ -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', diff --git a/lib/private/Files/ObjectStore/StorageObjectStore.php b/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php similarity index 91% rename from lib/private/Files/ObjectStore/StorageObjectStore.php rename to tests/lib/Files/ObjectStore/StorageBackedObjectStore.php index f170116a3a6e8..65a7f9aa97583 100644 --- a/lib/private/Files/ObjectStore/StorageObjectStore.php +++ b/tests/lib/Files/ObjectStore/StorageBackedObjectStore.php @@ -4,16 +4,16 @@ * 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; use function is_resource; /** - * Object store that wraps a storage backend, mostly for testing purposes + * Object store that wraps a storage backend, for testing purposes */ -class StorageObjectStore implements IObjectStore { +class StorageBackedObjectStore implements IObjectStore { public function __construct( private IStorage $storage, ) {