From e8d62ecc22a1794362590261b7642f9645f94142 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 22 Sep 2021 13:07:12 +0300 Subject: [PATCH] renaming 2 --- application/Espo/Classes/AssignmentNotificators/Email.php | 3 ++- application/Espo/Core/Mail/Importer.php | 2 +- .../Espo/Core/Notification/AssignmentNotificator.php | 4 +++- .../Params.php} | 4 ++-- .../Espo/Core/Notification/DefaultAssignmentNotificator.php | 4 +++- application/Espo/Tools/Notification/HookProcessor.php | 2 +- .../Core/Notification/AssignmentNotificatorParamsTest.php | 6 +++--- 7 files changed, 15 insertions(+), 10 deletions(-) rename application/Espo/Core/Notification/{AssignmentNotificatorParams.php => AssignmentNotificator/Params.php} (96%) diff --git a/application/Espo/Classes/AssignmentNotificators/Email.php b/application/Espo/Classes/AssignmentNotificators/Email.php index 1bbfaf2d08..d31258a981 100644 --- a/application/Espo/Classes/AssignmentNotificators/Email.php +++ b/application/Espo/Classes/AssignmentNotificators/Email.php @@ -33,6 +33,7 @@ use Espo\Services\Email as EmailService; use Espo\Services\Stream as StreamService; use Espo\Core\Notification\AssignmentNotificator; +use Espo\Core\Notification\AssignmentNotificator\Params; use Espo\Core\Notification\UserEnabledChecker; use Espo\Core\Notification\AssignmentNotificatorParams; use Espo\Core\ServiceFactory; @@ -77,7 +78,7 @@ class Email implements AssignmentNotificator $this->aclManager = $aclManager; } - public function process(Entity $entity, AssignmentNotificatorParams $params): void + public function process(Entity $entity, Params $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 06e70d3274..52c721606d 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\AssignmentNotificatorParams; +use Espo\Core\Notification\AssignmentNotificator\Params as AssignmentNotificatorParams; use Espo\Core\Mail\MessageWrapper; use Espo\Core\Utils\Config; use Espo\Core\FieldProcessing\Relation\LinkMultipleSaver; diff --git a/application/Espo/Core/Notification/AssignmentNotificator.php b/application/Espo/Core/Notification/AssignmentNotificator.php index e60f4cd6d2..63031aafec 100644 --- a/application/Espo/Core/Notification/AssignmentNotificator.php +++ b/application/Espo/Core/Notification/AssignmentNotificator.php @@ -31,10 +31,12 @@ namespace Espo\Core\Notification; use Espo\ORM\Entity; +use Espo\Core\Notification\AssignmentNotificator\Params; + /** * Processes assignment notifications. Called after entity is saved. */ interface AssignmentNotificator { - public function process(Entity $entity, AssignmentNotificatorParams $params): void; + public function process(Entity $entity, Params $params): void; } diff --git a/application/Espo/Core/Notification/AssignmentNotificatorParams.php b/application/Espo/Core/Notification/AssignmentNotificator/Params.php similarity index 96% rename from application/Espo/Core/Notification/AssignmentNotificatorParams.php rename to application/Espo/Core/Notification/AssignmentNotificator/Params.php index 6b3da00bc3..1e0fac250a 100644 --- a/application/Espo/Core/Notification/AssignmentNotificatorParams.php +++ b/application/Espo/Core/Notification/AssignmentNotificator/Params.php @@ -27,9 +27,9 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace Espo\Core\Notification; +namespace Espo\Core\Notification\AssignmentNotificator; -class AssignmentNotificatorParams +class Params { private $options = []; diff --git a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php index d0036a6a81..5cbfd53b12 100644 --- a/application/Espo/Core/Notification/DefaultAssignmentNotificator.php +++ b/application/Espo/Core/Notification/DefaultAssignmentNotificator.php @@ -35,6 +35,8 @@ use Espo\ORM\EntityManager; use Espo\Entities\User; use Espo\Entities\Notification; +use Espo\Core\Notification\AssignmentNotificator\Params; + class DefaultAssignmentNotificator implements AssignmentNotificator { protected $user; @@ -50,7 +52,7 @@ class DefaultAssignmentNotificator implements AssignmentNotificator $this->userChecker = $userChecker; } - public function process(Entity $entity, AssignmentNotificatorParams $params): void + public function process(Entity $entity, Params $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 438db24293..05d8a00e31 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\AssignmentNotificatorParams; +use Espo\Core\Notification\AssignmentNotificator\Params as AssignmentNotificatorParams; use Espo\Core\Utils\Metadata; use Espo\Core\Utils\Config; diff --git a/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php b/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php index 09becc3e71..8692cc2977 100644 --- a/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php +++ b/tests/unit/Espo/Core/Notification/AssignmentNotificatorParamsTest.php @@ -27,10 +27,10 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -namespace tests\unit\Espo\Core\FieldProcessing; +namespace tests\unit\Espo\Core\Notification; use Espo\Core\{ - Notification\AssignmentNotificatorParams, + Notification\AssignmentNotificator\Params, }; class AssignmentNotificatorParamsTest extends \PHPUnit\Framework\TestCase @@ -41,7 +41,7 @@ class AssignmentNotificatorParamsTest extends \PHPUnit\Framework\TestCase 'silent' => true, ]; - $params = AssignmentNotificatorParams + $params = Params ::create() ->withRawOptions($options);