From 60af9f5e9bfdd895d8d1fc57f7cc1a30c18ab9f3 Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Sun, 27 Mar 2022 16:21:19 +0100 Subject: [PATCH] [CORE][Queue] Rename App\Core\Queue\Queue to App\Core\Queue --- components/Notification/Notification.php | 2 +- plugins/ActivityPub/ActivityPub.php | 2 +- plugins/ActivityPub/Controller/Inbox.php | 2 +- plugins/WebHooks/WebHooks.php | 2 +- src/Core/GNUsocial.php | 2 +- src/Core/{Queue => }/Queue.php | 6 ++++-- 6 files changed, 9 insertions(+), 7 deletions(-) rename src/Core/{Queue => }/Queue.php (92%) diff --git a/components/Notification/Notification.php b/components/Notification/Notification.php index cb5b13dbef..bef60bc2cd 100644 --- a/components/Notification/Notification.php +++ b/components/Notification/Notification.php @@ -26,7 +26,7 @@ use App\Core\Event; use function App\Core\I18n\_m; use App\Core\Log; use App\Core\Modules\Component; -use App\Core\Queue\Queue; +use App\Core\Queue; use App\Core\Router\RouteLoader; use App\Core\Router\Router; use App\Entity\Activity; diff --git a/plugins/ActivityPub/ActivityPub.php b/plugins/ActivityPub/ActivityPub.php index 435e1160f9..5b53d2686a 100644 --- a/plugins/ActivityPub/ActivityPub.php +++ b/plugins/ActivityPub/ActivityPub.php @@ -40,7 +40,7 @@ use App\Core\HTTPClient; use function App\Core\I18n\_m; use App\Core\Log; use App\Core\Modules\Plugin; -use App\Core\Queue\Queue; +use App\Core\Queue; use App\Core\Router\RouteLoader; use App\Core\Router\Router; use App\Entity\Activity; diff --git a/plugins/ActivityPub/Controller/Inbox.php b/plugins/ActivityPub/Controller/Inbox.php index 5d52c302e0..3716441348 100644 --- a/plugins/ActivityPub/Controller/Inbox.php +++ b/plugins/ActivityPub/Controller/Inbox.php @@ -36,7 +36,7 @@ use App\Core\Controller; use App\Core\DB; use function App\Core\I18n\_m; use App\Core\Log; -use App\Core\Queue\Queue; +use App\Core\Queue; use App\Core\Router\Router; use App\Util\Common; use App\Util\Exception\ClientException; diff --git a/plugins/WebHooks/WebHooks.php b/plugins/WebHooks/WebHooks.php index 5369ee595a..33b266faca 100644 --- a/plugins/WebHooks/WebHooks.php +++ b/plugins/WebHooks/WebHooks.php @@ -26,7 +26,7 @@ use App\Core\Event; use App\Core\HTTPClient; use App\Core\Log; use App\Core\Modules\Plugin; -use App\Core\Queue\Queue; +use App\Core\Queue; use App\Core\Router\RouteLoader; use App\Entity\Activity; use App\Entity\Actor; diff --git a/src/Core/GNUsocial.php b/src/Core/GNUsocial.php index 84f034bd1f..bab7c7e6f2 100644 --- a/src/Core/GNUsocial.php +++ b/src/Core/GNUsocial.php @@ -46,7 +46,7 @@ namespace App\Core; use App\Core\DB; use App\Core\I18n\I18n; -use App\Core\Queue\Queue; +use App\Core\Queue; use App\Core\Router\Router; use App\Kernel; use App\Util\Common; diff --git a/src/Core/Queue/Queue.php b/src/Core/Queue.php similarity index 92% rename from src/Core/Queue/Queue.php rename to src/Core/Queue.php index 63f6919624..cfd3f907cc 100644 --- a/src/Core/Queue/Queue.php +++ b/src/Core/Queue.php @@ -26,12 +26,14 @@ declare(strict_types = 1); * @category Wrapper * * @author Hugo Sales - * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org + * @copyright 2020-2022 Free Software Foundation, Inc http://www.fsf.org * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -namespace App\Core\Queue; +namespace App\Core; +use App\Core\Queue\MessageHigh; +use App\Core\Queue\MessageLow; use Symfony\Component\Messenger\MessageBusInterface; abstract class Queue