From a575a697040992c88ee54508f3886e4934eee6e8 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 20 Apr 2024 15:20:18 +0300 Subject: [PATCH] move --- application/Espo/Controllers/Admin.php | 4 ++-- .../AdminNotifications/Manager.php} | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) rename application/Espo/{Core/Utils/AdminNotificationManager.php => Tools/AdminNotifications/Manager.php} (97%) diff --git a/application/Espo/Controllers/Admin.php b/application/Espo/Controllers/Admin.php index 31db436faf..84ea7354a9 100644 --- a/application/Espo/Controllers/Admin.php +++ b/application/Espo/Controllers/Admin.php @@ -36,7 +36,7 @@ use Espo\Core\Container; use Espo\Core\DataManager; use Espo\Core\Api\Request; use Espo\Core\Utils\Config; -use Espo\Core\Utils\AdminNotificationManager; +use Espo\Tools\AdminNotifications\Manager; use Espo\Core\Utils\SystemRequirements; use Espo\Core\Utils\ScheduledJob; use Espo\Core\Upgrades\UpgradeManager; @@ -51,7 +51,7 @@ class Admin private Container $container, private Config $config, private User $user, - private AdminNotificationManager $adminNotificationManager, + private Manager $adminNotificationManager, private SystemRequirements $systemRequirements, private ScheduledJob $scheduledJob, private DataManager $dataManager diff --git a/application/Espo/Core/Utils/AdminNotificationManager.php b/application/Espo/Tools/AdminNotifications/Manager.php similarity index 97% rename from application/Espo/Core/Utils/AdminNotificationManager.php rename to application/Espo/Tools/AdminNotifications/Manager.php index 0781d1c061..b3cdb381f8 100644 --- a/application/Espo/Core/Utils/AdminNotificationManager.php +++ b/application/Espo/Tools/AdminNotifications/Manager.php @@ -27,15 +27,19 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace Espo\Core\Utils; +namespace Espo\Tools\AdminNotifications; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Language; +use Espo\Core\Utils\ScheduledJob; +use Espo\Core\Utils\Util; use Espo\Entities\Extension; use Espo\ORM\EntityManager; /** * Notifications on the admin panel. */ -class AdminNotificationManager +class Manager { public function __construct( private EntityManager $entityManager, @@ -174,7 +178,7 @@ class AdminNotificationManager private function getExtensionLatestInstalledVersion(string $extensionName): ?string { $extension = $this->entityManager - ->getRDBRepository('Extension') + ->getRDBRepository(Extension::ENTITY_TYPE) ->select(['version']) ->where([ 'name' => $extensionName,