From 2d84d0f5bfc998808608ee716e04ee53255c2f90 Mon Sep 17 00:00:00 2001 From: Julien CHATY-CAPELLE Date: Sun, 26 May 2024 12:51:24 +0200 Subject: [PATCH] fix(core): use OC namespace for core ReponseDefinitions instead of OCA Signed-off-by: Julien CHATY-CAPELLE --- core/Controller/AutoCompleteController.php | 2 +- core/Controller/ClientFlowLoginV2Controller.php | 2 +- core/Controller/CollaborationResourcesController.php | 2 +- core/Controller/HoverCardController.php | 2 +- core/Controller/NavigationController.php | 2 +- core/Controller/ReferenceApiController.php | 2 +- core/Controller/TaskProcessingApiController.php | 2 +- core/Controller/TeamsApiController.php | 2 +- core/Controller/TextProcessingApiController.php | 2 +- core/Controller/TextToImageApiController.php | 2 +- core/Controller/UnifiedSearchController.php | 2 +- core/ResponseDefinitions.php | 2 +- lib/composer/composer/autoload_classmap.php | 1 + lib/composer/composer/autoload_static.php | 1 + 14 files changed, 14 insertions(+), 12 deletions(-) diff --git a/core/Controller/AutoCompleteController.php b/core/Controller/AutoCompleteController.php index 70bbd61f589..02d525e1f7a 100644 --- a/core/Controller/AutoCompleteController.php +++ b/core/Controller/AutoCompleteController.php @@ -8,7 +8,7 @@ declare(strict_types=1); */ namespace OC\Core\Controller; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\DataResponse; diff --git a/core/Controller/ClientFlowLoginV2Controller.php b/core/Controller/ClientFlowLoginV2Controller.php index 919810eb728..bfa455ebe92 100644 --- a/core/Controller/ClientFlowLoginV2Controller.php +++ b/core/Controller/ClientFlowLoginV2Controller.php @@ -10,8 +10,8 @@ namespace OC\Core\Controller; use OC\Core\Db\LoginFlowV2; use OC\Core\Exception\LoginFlowV2NotFoundException; +use OC\Core\ResponseDefinitions; use OC\Core\Service\LoginFlowV2Service; -use OCA\Core\ResponseDefinitions; use OCP\AppFramework\Controller; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\FrontpageRoute; diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php index 5422358b6cf..6cc351d9cdc 100644 --- a/core/Controller/CollaborationResourcesController.php +++ b/core/Controller/CollaborationResourcesController.php @@ -10,7 +10,7 @@ declare(strict_types=1); namespace OC\Core\Controller; use Exception; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\DataResponse; diff --git a/core/Controller/HoverCardController.php b/core/Controller/HoverCardController.php index da9c2580ea6..89ca3576dbe 100644 --- a/core/Controller/HoverCardController.php +++ b/core/Controller/HoverCardController.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace OC\Core\Controller; use OC\Contacts\ContactsMenu\Manager; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\DataResponse; diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php index 8e5e9f58cf0..85656116144 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -5,7 +5,7 @@ */ namespace OC\Core\Controller; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\DataResponse; diff --git a/core/Controller/ReferenceApiController.php b/core/Controller/ReferenceApiController.php index dc88223572d..77b4b43fa3a 100644 --- a/core/Controller/ReferenceApiController.php +++ b/core/Controller/ReferenceApiController.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace OC\Core\Controller; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\DataResponse; diff --git a/core/Controller/TaskProcessingApiController.php b/core/Controller/TaskProcessingApiController.php index 2b56ed80ac6..90ee650f1ed 100644 --- a/core/Controller/TaskProcessingApiController.php +++ b/core/Controller/TaskProcessingApiController.php @@ -10,7 +10,7 @@ declare(strict_types=1); namespace OC\Core\Controller; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\AnonRateLimit; use OCP\AppFramework\Http\Attribute\ApiRoute; diff --git a/core/Controller/TeamsApiController.php b/core/Controller/TeamsApiController.php index a4296ff5df6..a27f6deff76 100644 --- a/core/Controller/TeamsApiController.php +++ b/core/Controller/TeamsApiController.php @@ -8,7 +8,7 @@ declare(strict_types=1); namespace OC\Core\Controller; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\Attribute\NoAdminRequired; diff --git a/core/Controller/TextProcessingApiController.php b/core/Controller/TextProcessingApiController.php index 3a26af6b50c..40e569ee1d9 100644 --- a/core/Controller/TextProcessingApiController.php +++ b/core/Controller/TextProcessingApiController.php @@ -11,7 +11,7 @@ declare(strict_types=1); namespace OC\Core\Controller; use InvalidArgumentException; -use OCA\Core\ResponseDefinitions; +use OC\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\AnonRateLimit; use OCP\AppFramework\Http\Attribute\ApiRoute; diff --git a/core/Controller/TextToImageApiController.php b/core/Controller/TextToImageApiController.php index fe8362a5e65..4a560d8b04d 100644 --- a/core/Controller/TextToImageApiController.php +++ b/core/Controller/TextToImageApiController.php @@ -10,8 +10,8 @@ declare(strict_types=1); namespace OC\Core\Controller; +use OC\Core\ResponseDefinitions; use OC\Files\AppData\AppData; -use OCA\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\AnonRateLimit; use OCP\AppFramework\Http\Attribute\ApiRoute; diff --git a/core/Controller/UnifiedSearchController.php b/core/Controller/UnifiedSearchController.php index 24e289826d9..236ca845da6 100644 --- a/core/Controller/UnifiedSearchController.php +++ b/core/Controller/UnifiedSearchController.php @@ -9,10 +9,10 @@ declare(strict_types=1); namespace OC\Core\Controller; use InvalidArgumentException; +use OC\Core\ResponseDefinitions; use OC\Search\SearchComposer; use OC\Search\SearchQuery; use OC\Search\UnsupportedFilter; -use OCA\Core\ResponseDefinitions; use OCP\AppFramework\Http; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\DataResponse; diff --git a/core/ResponseDefinitions.php b/core/ResponseDefinitions.php index 93662fbaac4..1108e8013a6 100644 --- a/core/ResponseDefinitions.php +++ b/core/ResponseDefinitions.php @@ -7,7 +7,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Core; +namespace OC\Core; /** * @psalm-type CoreLoginFlowV2Credentials = array{ diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 4ee453f0260..f3ab2e6eaae 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1320,6 +1320,7 @@ return array( 'OC\\Core\\Migrations\\Version29000Date20240131122720' => $baseDir . '/core/Migrations/Version29000Date20240131122720.php', 'OC\\Core\\Migrations\\Version30000Date20240429122720' => $baseDir . '/core/Migrations/Version30000Date20240429122720.php', 'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php', + 'OC\\Core\\ResponseDefinitions' => $baseDir . '/core/ResponseDefinitions.php', 'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php', 'OC\\DB\\AdapterMySQL' => $baseDir . '/lib/private/DB/AdapterMySQL.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index d6cbb1ac886..f3edbf27f3d 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1353,6 +1353,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Migrations\\Version29000Date20240131122720' => __DIR__ . '/../../..' . '/core/Migrations/Version29000Date20240131122720.php', 'OC\\Core\\Migrations\\Version30000Date20240429122720' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240429122720.php', 'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php', + 'OC\\Core\\ResponseDefinitions' => __DIR__ . '/../../..' . '/core/ResponseDefinitions.php', 'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php', 'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php', 'OC\\DB\\AdapterMySQL' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterMySQL.php', -- 2.39.5