diff --git a/application/Espo/Classes/AssignmentNotificators/Email.php b/application/Espo/Classes/AssignmentNotificators/Email.php index 7aa4817cb5..f8781a33df 100644 --- a/application/Espo/Classes/AssignmentNotificators/Email.php +++ b/application/Espo/Classes/AssignmentNotificators/Email.php @@ -34,7 +34,7 @@ use Espo\Services\Services\Stream as StreamService; use Espo\Core\Notification\AssignmentNotificator; use Espo\Core\Notification\UserEnabledChecker; -use Espo\Core\Notification\NotificatorParams; +use Espo\Core\Notification\AssignmentNotificatorParams; use Espo\Core\ServiceFactory; use Espo\Core\AclManager; @@ -77,7 +77,7 @@ class Email implements AssignmentNotificator $this->aclManager = $aclManager; } - public function process(Entity $entity, NotificatorParams $params): void + public function process(Entity $entity, AssignmentNotificatorParams $params): void { if (!in_array($entity->get('status'), ['Archived', 'Sent', 'Being Imported'])) { return; diff --git a/application/Espo/Core/Mail/Importer.php b/application/Espo/Core/Mail/Importer.php index d3b4a66b1f..06e70d3274 100644 --- a/application/Espo/Core/Mail/Importer.php +++ b/application/Espo/Core/Mail/Importer.php @@ -35,7 +35,7 @@ use Espo\ORM\EntityManager; use Espo\Core\Notification\AssignmentNotificator; use Espo\Core\Notification\AssignmentNotificatorFactory; -use Espo\Core\Notification\NotificatorParams; +use Espo\Core\Notification\AssignmentNotificatorParams; use Espo\Core\Mail\MessageWrapper; use Espo\Core\Utils\Config; use Espo\Core\FieldProcessing\Relation\LinkMultipleSaver; @@ -685,7 +685,7 @@ class Importer if ($this->emailNotificationsEnabled()) { $this->notificator->process( $duplicate, - NotificatorParams::create()->withRawOptions(['isBeingImported' => true]) + AssignmentNotificatorParams::create()->withRawOptions(['isBeingImported' => true]) ); } diff --git a/application/Espo/Core/Notification/AssignmentNotificator.php b/application/Espo/Core/Notification/AssignmentNotificator.php index 6fc21b4735..e60f4cd6d2 100644 --- a/application/Espo/Core/Notification/AssignmentNotificator.php +++ b/application/Espo/Core/Notification/AssignmentNotificator.php @@ -36,5 +36,5 @@ use Espo\ORM\Entity; */ interface AssignmentNotificator { - public function process(Entity $entity, NotificatorParams $params): void; + public function process(Entity $entity, AssignmentNotificatorParams $params): void; } diff --git a/application/Espo/Core/Notification/NotificatorParams.php b/application/Espo/Core/Notification/AssignmentNotificatorParams.php similarity index 98% rename from application/Espo/Core/Notification/NotificatorParams.php rename to application/Espo/Core/Notification/AssignmentNotificatorParams.php index be46689ae7..6b3da00bc3 100644 --- a/application/Espo/Core/Notification/NotificatorParams.php +++ b/application/Espo/Core/Notification/AssignmentNotificatorParams.php @@ -29,7 +29,7 @@ namespace Espo\Core\Notification; -class NotificatorParams +class AssignmentNotificatorParams { private $options = []; diff --git a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php index b1e2d48fd8..d0036a6a81 100644 --- a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php +++ b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php @@ -50,7 +50,7 @@ class DefaultAssignmentNotificator implements AssignmentNotificator $this->userChecker = $userChecker; } - public function process(Entity $entity, NotificatorParams $params): void + public function process(Entity $entity, AssignmentNotificatorParams $params): void { if ($entity->hasLinkMultipleField('assignedUsers')) { $userIdList = $entity->getLinkMultipleIdList('assignedUsers'); diff --git a/application/Espo/Tools/Notification/HookProcessor.php b/application/Espo/Tools/Notification/HookProcessor.php index 36bdcd0769..438db24293 100644 --- a/application/Espo/Tools/Notification/HookProcessor.php +++ b/application/Espo/Tools/Notification/HookProcessor.php @@ -31,7 +31,7 @@ namespace Espo\Tools\Notification; use Espo\Core\Notification\AssignmentNotificatorFactory; use Espo\Core\Notification\AssignmentNotificator; -use Espo\Core\Notification\NotificatorParams; +use Espo\Core\Notification\AssignmentNotificatorParams; use Espo\Core\Utils\Metadata; use Espo\Core\Utils\Config; @@ -108,7 +108,7 @@ class HookProcessor return; } - $params = NotificatorParams::create()->withRawOptions($options); + $params = AssignmentNotificatorParams::create()->withRawOptions($options); $notificator->process($entity, $params); } diff --git a/tests/unit/Espo/Core/Notification/NotificatorParamsTest.php b/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php similarity index 92% rename from tests/unit/Espo/Core/Notification/NotificatorParamsTest.php rename to tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php index cc595b3e8d..09becc3e71 100644 --- a/tests/unit/Espo/Core/Notification/NotificatorParamsTest.php +++ b/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php @@ -30,10 +30,10 @@ namespace tests\unit\Espo\Core\FieldProcessing; use Espo\Core\{ - Notification\NotificatorParams, + Notification\AssignmentNotificatorParams, }; -class NotificatorParamsTest extends \PHPUnit\Framework\TestCase +class AssignmentNotificatorParamsTest extends \PHPUnit\Framework\TestCase { public function testOne(): void { @@ -41,7 +41,7 @@ class NotificatorParamsTest extends \PHPUnit\Framework\TestCase 'silent' => true, ]; - $params = NotificatorParams + $params = AssignmentNotificatorParams ::create() ->withRawOptions($options);