refactor: moved Admin API related controller in the correct folder

thorsten · Nov 18, 2024 · 57eb7cb · 57eb7cb
1 parent 0a9322d
commit 57eb7cb
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 59 deletions.
diff --git a/phpmyfaq/src/admin-routes.php b/phpmyfaq/src/admin-routes.php
@@ -15,30 +15,30 @@
  * @since     2023-07-08
  */
 
-use phpMyFAQ\Controller\Administration\AttachmentController;
-use phpMyFAQ\Controller\Administration\CategoryController;
-use phpMyFAQ\Controller\Administration\CommentController;
-use phpMyFAQ\Controller\Administration\ConfigurationController;
-use phpMyFAQ\Controller\Administration\ConfigurationTabController;
-use phpMyFAQ\Controller\Administration\DashboardController;
-use phpMyFAQ\Controller\Administration\ElasticsearchController;
-use phpMyFAQ\Controller\Administration\ExportController;
-use phpMyFAQ\Controller\Administration\FaqController;
-use phpMyFAQ\Controller\Administration\FormController;
-use phpMyFAQ\Controller\Administration\GlossaryController;
-use phpMyFAQ\Controller\Administration\GroupController;
-use phpMyFAQ\Controller\Administration\ImageController;
-use phpMyFAQ\Controller\Administration\InstanceController;
-use phpMyFAQ\Controller\Administration\MarkdownController;
-use phpMyFAQ\Controller\Administration\NewsController;
-use phpMyFAQ\Controller\Administration\QuestionController;
-use phpMyFAQ\Controller\Administration\SearchController;
-use phpMyFAQ\Controller\Administration\SessionController;
-use phpMyFAQ\Controller\Administration\StatisticsController;
-use phpMyFAQ\Controller\Administration\StopWordController;
-use phpMyFAQ\Controller\Administration\TagController;
-use phpMyFAQ\Controller\Administration\UpdateController;
-use phpMyFAQ\Controller\Administration\UserController;
+use phpMyFAQ\Controller\Administration\Api\AttachmentController;
+use phpMyFAQ\Controller\Administration\Api\CategoryController;
+use phpMyFAQ\Controller\Administration\Api\CommentController;
+use phpMyFAQ\Controller\Administration\Api\ConfigurationController;
+use phpMyFAQ\Controller\Administration\Api\ConfigurationTabController;
+use phpMyFAQ\Controller\Administration\Api\DashboardController;
+use phpMyFAQ\Controller\Administration\Api\ElasticsearchController;
+use phpMyFAQ\Controller\Administration\Api\ExportController;
+use phpMyFAQ\Controller\Administration\Api\FaqController;
+use phpMyFAQ\Controller\Administration\Api\FormController;
+use phpMyFAQ\Controller\Administration\Api\GlossaryController;
+use phpMyFAQ\Controller\Administration\Api\GroupController;
+use phpMyFAQ\Controller\Administration\Api\ImageController;
+use phpMyFAQ\Controller\Administration\Api\InstanceController;
+use phpMyFAQ\Controller\Administration\Api\MarkdownController;
+use phpMyFAQ\Controller\Administration\Api\NewsController;
+use phpMyFAQ\Controller\Administration\Api\QuestionController;
+use phpMyFAQ\Controller\Administration\Api\SearchController;
+use phpMyFAQ\Controller\Administration\Api\SessionController;
+use phpMyFAQ\Controller\Administration\Api\StatisticsController;
+use phpMyFAQ\Controller\Administration\Api\StopWordController;
+use phpMyFAQ\Controller\Administration\Api\TagController;
+use phpMyFAQ\Controller\Administration\Api\UpdateController;
+use phpMyFAQ\Controller\Administration\Api\UserController;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
 

diff --git a/...r/Administration/AttachmentController.php → ...ministration/Api/AttachmentController.php b/...r/Administration/AttachmentController.php → ...ministration/Api/AttachmentController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-26
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Attachment\AttachmentException;
 use phpMyFAQ\Attachment\AttachmentFactory;
@@ -33,7 +33,7 @@
 class AttachmentController extends AbstractController
 {
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     #[Route('./admin/api/content/attachments')]
     public function delete(Request $request): JsonResponse
@@ -62,7 +62,7 @@ public function delete(Request $request): JsonResponse
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     #[Route('./admin/api/content/attachments/refresh')]
     public function refresh(Request $request): JsonResponse

diff --git a/...ler/Administration/CategoryController.php → ...Administration/Api/CategoryController.php b/...ler/Administration/CategoryController.php → ...Administration/Api/CategoryController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-27
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Category;
 use phpMyFAQ\Category\Image;

diff --git a/...ller/Administration/CommentController.php → .../Administration/Api/CommentController.php b/...ller/Administration/CommentController.php → .../Administration/Api/CommentController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-25
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Comments;
 use phpMyFAQ\Controller\AbstractController;

diff --git a/...dministration/ConfigurationController.php → ...istration/Api/ConfigurationController.php b/...dministration/ConfigurationController.php → ...istration/Api/ConfigurationController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-26
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...nistration/ConfigurationTabController.php → ...ration/Api/ConfigurationTabController.php b/...nistration/ConfigurationTabController.php → ...ration/Api/ConfigurationTabController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-30
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...er/Administration/DashboardController.php → ...dministration/Api/DashboardController.php b/...er/Administration/DashboardController.php → ...dministration/Api/DashboardController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-15
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Administration\Api;
 use phpMyFAQ\Controller\AbstractController;

diff --git a/...dministration/ElasticsearchController.php → ...istration/Api/ElasticsearchController.php b/...dministration/ElasticsearchController.php → ...istration/Api/ElasticsearchController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-26
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use Elastic\Elasticsearch\Exception\ClientResponseException;
 use Elastic\Elasticsearch\Exception\ServerResponseException;

diff --git a/...oller/Administration/ExportController.php → ...r/Administration/Api/ExportController.php b/...oller/Administration/ExportController.php → ...r/Administration/Api/ExportController.php
@@ -15,13 +15,12 @@
  * @since     2023-12-23
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use League\CommonMark\Exception\CommonMarkException;
 use phpMyFAQ\Administration\HttpStreamer;
 use phpMyFAQ\Administration\Report;
 use phpMyFAQ\Category;
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Enums\PermissionType;

diff --git a/...ntroller/Administration/FaqController.php → ...ller/Administration/Api/FaqController.php b/...ntroller/Administration/FaqController.php → ...ller/Administration/Api/FaqController.php
@@ -14,7 +14,7 @@
  * @since     2023-10-28
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use DateTime;
 use Exception;
@@ -32,8 +32,8 @@
 use phpMyFAQ\Enums\PermissionType;
 use phpMyFAQ\Enums\SeoType;
 use phpMyFAQ\Faq;
-use phpMyFAQ\Faq\Permission as FaqPermission;
 use phpMyFAQ\Faq\Import;
+use phpMyFAQ\Faq\Permission as FaqPermission;
 use phpMyFAQ\Filter;
 use phpMyFAQ\Helper\CategoryHelper;
 use phpMyFAQ\Helper\SearchHelper;

diff --git a/...troller/Administration/FormController.php → ...ler/Administration/Api/FormController.php b/...troller/Administration/FormController.php → ...ler/Administration/Api/FormController.php
@@ -15,17 +15,18 @@
  * @since     2024-03-09
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
-use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Controller\AbstractController;
+use phpMyFAQ\Controller\Administration\Route;
+use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Enums\PermissionType;
+use phpMyFAQ\Filter;
+use phpMyFAQ\Forms;
+use phpMyFAQ\Session\Token;
 use phpMyFAQ\Translation;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use phpMyFAQ\Filter;
-use phpMyFAQ\Session\Token;
-use phpMyFAQ\Forms;
 use Symfony\Component\HttpFoundation\Response;
 
 class FormController extends AbstractController

diff --git a/...ler/Administration/GlossaryController.php → ...Administration/Api/GlossaryController.php b/...ler/Administration/GlossaryController.php → ...Administration/Api/GlossaryController.php
@@ -15,7 +15,7 @@
  * @since     2024-01-27
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...roller/Administration/GroupController.php → ...er/Administration/Api/GroupController.php b/...roller/Administration/GroupController.php → ...er/Administration/Api/GroupController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-27
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...roller/Administration/ImageController.php → ...er/Administration/Api/ImageController.php b/...roller/Administration/ImageController.php → ...er/Administration/Api/ImageController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-26
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...ler/Administration/InstanceController.php → ...Administration/Api/InstanceController.php b/...ler/Administration/InstanceController.php → ...Administration/Api/InstanceController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-28
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Configuration\DatabaseConfiguration;
 use phpMyFAQ\Controller\AbstractController;

diff --git a/...ler/Administration/MarkdownController.php → ...Administration/Api/MarkdownController.php b/...ler/Administration/MarkdownController.php → ...Administration/Api/MarkdownController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-25
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use League\CommonMark\CommonMarkConverter;
 use League\CommonMark\Exception\CommonMarkException;

diff --git a/...troller/Administration/NewsController.php → ...ler/Administration/Api/NewsController.php b/...troller/Administration/NewsController.php → ...ler/Administration/Api/NewsController.php
@@ -15,7 +15,7 @@
  * @since     2024-04-20
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use DateTime;
 use phpMyFAQ\Controller\AbstractController;

diff --git a/...ler/Administration/QuestionController.php → ...Administration/Api/QuestionController.php b/...ler/Administration/QuestionController.php → ...Administration/Api/QuestionController.php
@@ -15,10 +15,9 @@
  * @since     2023-10-30
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
-use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Enums\PermissionType;
 use phpMyFAQ\Question;
 use phpMyFAQ\Session\Token;

diff --git a/...oller/Administration/SearchController.php → ...r/Administration/Api/SearchController.php b/...oller/Administration/SearchController.php → ...r/Administration/Api/SearchController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-26
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...ller/Administration/SessionController.php → .../Administration/Api/SessionController.php b/...ller/Administration/SessionController.php → .../Administration/Api/SessionController.php
@@ -16,7 +16,7 @@
  * @since     2024-01-13
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use Exception;
 use phpMyFAQ\Controller\AbstractController;

diff --git a/...r/Administration/StatisticsController.php → ...ministration/Api/StatisticsController.php b/...r/Administration/StatisticsController.php → ...ministration/Api/StatisticsController.php
@@ -15,7 +15,7 @@
  * @since     2024-04-21
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use JsonException;
 use phpMyFAQ\Administration\AdminLog;

diff --git a/...ler/Administration/StopWordController.php → ...Administration/Api/StopWordController.php b/...ler/Administration/StopWordController.php → ...Administration/Api/StopWordController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-28
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;

diff --git a/...ntroller/Administration/TagController.php → ...ller/Administration/Api/TagController.php b/...ntroller/Administration/TagController.php → ...ller/Administration/Api/TagController.php
@@ -15,9 +15,8 @@
  * @since     2023-10-27
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
-use phpMyFAQ\Configuration;
 use phpMyFAQ\Controller\AbstractController;
 use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Entity\Tag;

diff --git a/...oller/Administration/UpdateController.php → ...r/Administration/Api/UpdateController.php b/...oller/Administration/UpdateController.php → ...r/Administration/Api/UpdateController.php
@@ -15,7 +15,7 @@
  * @since     2023-07-29
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use DateTime;
 use DateTimeInterface;
@@ -24,7 +24,6 @@
 use phpMyFAQ\Core\Exception;
 use phpMyFAQ\Enums\PermissionType;
 use phpMyFAQ\Filter;
-use phpMyFAQ\Setup\EnvironmentConfigurator;
 use phpMyFAQ\Setup\Update;
 use phpMyFAQ\Setup\Upgrade;
 use phpMyFAQ\System;

diff --git a/...troller/Administration/UserController.php → ...ler/Administration/Api/UserController.php b/...troller/Administration/UserController.php → ...ler/Administration/Api/UserController.php
@@ -15,7 +15,7 @@
  * @since     2023-10-27
  */
 
-namespace phpMyFAQ\Controller\Administration;
+namespace phpMyFAQ\Controller\Administration\Api;
 
 use phpMyFAQ\Administration\Report;
 use phpMyFAQ\Auth;