diff --git a/apps/files/tests/Sharing/Source/NodeShareSourceTypeTest.php b/apps/files/tests/Sharing/Source/NodeShareSourceTypeTest.php index 3311775b4cc..c5cd1026316 100644 --- a/apps/files/tests/Sharing/Source/NodeShareSourceTypeTest.php +++ b/apps/files/tests/Sharing/Source/NodeShareSourceTypeTest.php @@ -12,9 +12,9 @@ use NCU\Sharing\ISharingRegistry; use NCU\Sharing\ShareAccessContext; use NCU\Sharing\Source\ShareSource; use OC\Files\Filesystem; +use OC\Sharing\SharingBackend; use OC\User\Database; use OCA\Files\Sharing\Source\NodeShareSourceType; -use OCA\Sharing\SharingBackend; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\IRootFolder; use OCP\Files\Node; diff --git a/apps/sharing/composer/composer/autoload_classmap.php b/apps/sharing/composer/composer/autoload_classmap.php index 163ae995691..0d6e87b5cfd 100644 --- a/apps/sharing/composer/composer/autoload_classmap.php +++ b/apps/sharing/composer/composer/autoload_classmap.php @@ -27,5 +27,4 @@ return array( 'OCA\\Sharing\\Middleware\\ShareApiEnabledMiddleware' => $baseDir . '/../lib/Middleware/ShareApiEnabledMiddleware.php', 'OCA\\Sharing\\Migration\\Version1000Date20250929161325' => $baseDir . '/../lib/Migration/Version1000Date20250929161325.php', 'OCA\\Sharing\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php', - 'OCA\\Sharing\\SharingBackend' => $baseDir . '/../lib/SharingBackend.php', ); diff --git a/apps/sharing/composer/composer/autoload_static.php b/apps/sharing/composer/composer/autoload_static.php index 00ae4e33b5d..22a3d83d9e4 100644 --- a/apps/sharing/composer/composer/autoload_static.php +++ b/apps/sharing/composer/composer/autoload_static.php @@ -42,7 +42,6 @@ class ComposerStaticInitSharing 'OCA\\Sharing\\Middleware\\ShareApiEnabledMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ShareApiEnabledMiddleware.php', 'OCA\\Sharing\\Migration\\Version1000Date20250929161325' => __DIR__ . '/..' . '/../lib/Migration/Version1000Date20250929161325.php', 'OCA\\Sharing\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php', - 'OCA\\Sharing\\SharingBackend' => __DIR__ . '/..' . '/../lib/SharingBackend.php', ); public static function getInitializer(ClassLoader $loader) diff --git a/apps/sharing/lib/AppInfo/Application.php b/apps/sharing/lib/AppInfo/Application.php index 0eec114787d..85974c7c73a 100644 --- a/apps/sharing/lib/AppInfo/Application.php +++ b/apps/sharing/lib/AppInfo/Application.php @@ -10,9 +10,9 @@ declare(strict_types=1); namespace OCA\Sharing\AppInfo; use NCU\Sharing\ISharingRegistry; +use OC\Sharing\SharingBackend; use OCA\Sharing\Capabilities; use OCA\Sharing\Middleware\ShareApiEnabledMiddleware; -use OCA\Sharing\SharingBackend; use OCP\AppFramework\App; use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootstrap; diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index c58f6a0ed30..e8f6829d5ae 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -2296,6 +2296,7 @@ return array( 'OC\\Share20\\UserDeletedListener' => $baseDir . '/lib/private/Share20/UserDeletedListener.php', 'OC\\Share20\\UserRemovedListener' => $baseDir . '/lib/private/Share20/UserRemovedListener.php', 'OC\\Share\\Constants' => $baseDir . '/lib/private/Share/Constants.php', + 'OC\\Sharing\\SharingBackend' => $baseDir . '/lib/private/Sharing/SharingBackend.php', 'OC\\Sharing\\SharingManager' => $baseDir . '/lib/private/Sharing/SharingManager.php', 'OC\\Sharing\\SharingRegistry' => $baseDir . '/lib/private/Sharing/SharingRegistry.php', 'OC\\Snowflake\\APCuSequence' => $baseDir . '/lib/private/Snowflake/APCuSequence.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 32e4ffee59a..d2b31718dab 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -2337,6 +2337,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Share20\\UserDeletedListener' => __DIR__ . '/../../..' . '/lib/private/Share20/UserDeletedListener.php', 'OC\\Share20\\UserRemovedListener' => __DIR__ . '/../../..' . '/lib/private/Share20/UserRemovedListener.php', 'OC\\Share\\Constants' => __DIR__ . '/../../..' . '/lib/private/Share/Constants.php', + 'OC\\Sharing\\SharingBackend' => __DIR__ . '/../../..' . '/lib/private/Sharing/SharingBackend.php', 'OC\\Sharing\\SharingManager' => __DIR__ . '/../../..' . '/lib/private/Sharing/SharingManager.php', 'OC\\Sharing\\SharingRegistry' => __DIR__ . '/../../..' . '/lib/private/Sharing/SharingRegistry.php', 'OC\\Snowflake\\APCuSequence' => __DIR__ . '/../../..' . '/lib/private/Snowflake/APCuSequence.php', diff --git a/apps/sharing/lib/SharingBackend.php b/lib/private/Sharing/SharingBackend.php similarity index 99% rename from apps/sharing/lib/SharingBackend.php rename to lib/private/Sharing/SharingBackend.php index aa196bc00ac..bb6db33cefb 100644 --- a/apps/sharing/lib/SharingBackend.php +++ b/lib/private/Sharing/SharingBackend.php @@ -7,7 +7,7 @@ declare(strict_types=1); -namespace OCA\Sharing; +namespace OC\Sharing; use Exception; use NCU\Sharing\Exception\ShareInvalidException; diff --git a/lib/private/Sharing/SharingManager.php b/lib/private/Sharing/SharingManager.php index e4d77626b20..62f77fcccc2 100644 --- a/lib/private/Sharing/SharingManager.php +++ b/lib/private/Sharing/SharingManager.php @@ -28,7 +28,6 @@ use NCU\Sharing\ShareState; use NCU\Sharing\ShareUser; use NCU\Sharing\Source\ShareSource; use OC\Core\Sharing\Permission\ReshareSharePermissionType; -use OCA\Sharing\SharingBackend; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventDispatcher; use OCP\EventDispatcher\IEventListener; diff --git a/tests/Core/Sharing/Recipient/GroupShareRecipientTypeTest.php b/tests/Core/Sharing/Recipient/GroupShareRecipientTypeTest.php index 954e5835359..16e83cb7128 100644 --- a/tests/Core/Sharing/Recipient/GroupShareRecipientTypeTest.php +++ b/tests/Core/Sharing/Recipient/GroupShareRecipientTypeTest.php @@ -15,7 +15,7 @@ use NCU\Sharing\Recipient\ShareRecipient; use NCU\Sharing\ShareAccessContext; use OC\Core\Sharing\Recipient\GroupShareRecipientType; use OC\Group\Database; -use OCA\Sharing\SharingBackend; +use OC\Sharing\SharingBackend; use OCP\EventDispatcher\IEventDispatcher; use OCP\IDBConnection; use OCP\IGroup; diff --git a/tests/Core/Sharing/Recipient/UserShareRecipientTypeTest.php b/tests/Core/Sharing/Recipient/UserShareRecipientTypeTest.php index 4cc6f232ea7..97cccdde43e 100644 --- a/tests/Core/Sharing/Recipient/UserShareRecipientTypeTest.php +++ b/tests/Core/Sharing/Recipient/UserShareRecipientTypeTest.php @@ -14,8 +14,8 @@ use NCU\Sharing\ISharingRegistry; use NCU\Sharing\Recipient\ShareRecipient; use NCU\Sharing\ShareAccessContext; use OC\Core\Sharing\Recipient\UserShareRecipientType; +use OC\Sharing\SharingBackend; use OC\User\Database; -use OCA\Sharing\SharingBackend; use OCP\EventDispatcher\IEventDispatcher; use OCP\IDBConnection; use OCP\IUser; diff --git a/tests/lib/Sharing/AbstractSharingManagerTests.php b/tests/lib/Sharing/AbstractSharingManagerTests.php index dddd33f6ed0..6584b5506ad 100644 --- a/tests/lib/Sharing/AbstractSharingManagerTests.php +++ b/tests/lib/Sharing/AbstractSharingManagerTests.php @@ -19,7 +19,7 @@ use NCU\Sharing\ShareAccessContext; use NCU\Sharing\ShareState; use NCU\Sharing\Source\ShareSource; use OC\Core\Sharing\Permission\ReshareSharePermissionType; -use OCA\Sharing\SharingBackend; +use OC\Sharing\SharingBackend; use OCP\EventDispatcher\IEventDispatcher; use OCP\HintException; use OCP\IDBConnection;