From b53378a1d353a0975f3124669f8e95b5b2be84e4 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 12 Mar 2022 19:44:25 +0200 Subject: [PATCH] type fixes --- .../Classes/Acl/AuthToken/AccessChecker.php | 3 +++ .../Espo/Classes/Acl/Email/AccessChecker.php | 3 +++ .../Espo/Classes/Acl/Import/AccessChecker.php | 4 ++++ .../Espo/Classes/Acl/Note/AccessChecker.php | 3 +++ .../Espo/Classes/Acl/Portal/AccessChecker.php | 3 +++ .../Acl/ScheduledJob/AccessChecker.php | 3 +++ .../Classes/Acl/Webhook/AccessChecker.php | 3 +++ .../Classes/AclPortal/Email/AccessChecker.php | 3 +++ .../Classes/AclPortal/Note/AccessChecker.php | 3 +++ .../AppParams/TemplateEntityTypeList.php | 18 +++++--------- .../Classes/AssignmentNotificators/Email.php | 2 +- application/Espo/Classes/Cleanup/Exports.php | 2 +- .../Espo/Classes/Cleanup/MassActions.php | 2 +- .../Espo/Classes/Cleanup/Reminders.php | 2 +- .../Espo/Classes/Cleanup/WebhookQueue.php | 2 +- .../DefaultLayouts/DefaultSidePanelType.php | 14 +++++------ .../DuplicateWhereBuilders/Company.php | 6 +++++ .../Classes/DuplicateWhereBuilders/Person.php | 6 +++++ .../FieldDuplicators/AttachmentMultiple.php | 4 ++-- .../FieldProcessing/Email/IcsDataLoader.php | 6 +++++ .../Email/StringDataLoader.php | 6 +++++ .../Email/UserColumnsLoader.php | 3 +++ .../Note/AttachmentsLoader.php | 3 +++ .../FieldProcessing/Portal/UrlLoader.php | 3 +++ .../FieldProcessing/User/LastAccessLoader.php | 3 +++ .../Espo/Classes/FieldValidators/IntType.php | 6 +++++ .../Espo/Classes/Jobs/CheckNewVersion.php | 4 ++-- application/Espo/Classes/Jobs/Cleanup.php | 19 ++++++++------- .../ItemConverters/EmailAddressEquals.php | 4 ++-- .../Email/Where/ItemConverters/InFolder.php | 24 +++++++------------ .../ItemConverters/IsImportantIsFalse.php | 4 ++-- .../ItemConverters/IsImportantIsTrue.php | 4 ++-- .../Where/ItemConverters/IsNotReadIsFalse.php | 4 ++-- .../Where/ItemConverters/IsNotReadIsTrue.php | 4 ++-- .../Email/Where/ItemConverters/ToEquals.php | 4 ++-- 35 files changed, 123 insertions(+), 64 deletions(-) diff --git a/application/Espo/Classes/Acl/AuthToken/AccessChecker.php b/application/Espo/Classes/Acl/AuthToken/AccessChecker.php index 9173785312..e8a3d26240 100644 --- a/application/Espo/Classes/Acl/AuthToken/AccessChecker.php +++ b/application/Espo/Classes/Acl/AuthToken/AccessChecker.php @@ -38,6 +38,9 @@ use Espo\Core\{ Acl\Traits\DefaultAccessCheckerDependency, }; +/** + * @implements AccessEntityCREDChecker<\Espo\Entities\AuthToken> + */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/Acl/Email/AccessChecker.php b/application/Espo/Classes/Acl/Email/AccessChecker.php index b9e8769892..27434506d8 100644 --- a/application/Espo/Classes/Acl/Email/AccessChecker.php +++ b/application/Espo/Classes/Acl/Email/AccessChecker.php @@ -42,6 +42,9 @@ use Espo\Core\{ Acl\Traits\DefaultAccessCheckerDependency, }; +/** + * @implements AccessEntityCREDSChecker<\Espo\Entities\Email> + */ class AccessChecker implements AccessEntityCREDSChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/Acl/Import/AccessChecker.php b/application/Espo/Classes/Acl/Import/AccessChecker.php index 3f5e5d262a..e6d14635a9 100644 --- a/application/Espo/Classes/Acl/Import/AccessChecker.php +++ b/application/Espo/Classes/Acl/Import/AccessChecker.php @@ -39,6 +39,10 @@ use Espo\Core\{ Acl\AccessEntityDeleteChecker, }; +/** + * @implements AccessEntityReadChecker<\Espo\Entities\Import> + * @implements AccessEntityDeleteChecker<\Espo\Entities\Import> + */ class AccessChecker implements AccessEntityReadChecker, AccessEntityDeleteChecker { public function check(User $user, ScopeData $data): bool diff --git a/application/Espo/Classes/Acl/Note/AccessChecker.php b/application/Espo/Classes/Acl/Note/AccessChecker.php index 3047d7dbc7..7e668677dc 100644 --- a/application/Espo/Classes/Acl/Note/AccessChecker.php +++ b/application/Espo/Classes/Acl/Note/AccessChecker.php @@ -46,6 +46,9 @@ use Espo\Core\{ use DateTime; use Exception; +/** + * @implements AccessEntityCREDChecker<\Espo\Entities\Note> + */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/Acl/Portal/AccessChecker.php b/application/Espo/Classes/Acl/Portal/AccessChecker.php index 7989e1d894..c18ccd5b30 100644 --- a/application/Espo/Classes/Acl/Portal/AccessChecker.php +++ b/application/Espo/Classes/Acl/Portal/AccessChecker.php @@ -40,6 +40,9 @@ use Espo\Core\{ AclManager, }; +/** + * @implements AccessEntityCREDChecker<\Espo\Entities\Portal> + */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php b/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php index 9835764bd8..8e85033a50 100644 --- a/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php +++ b/application/Espo/Classes/Acl/ScheduledJob/AccessChecker.php @@ -40,6 +40,9 @@ use Espo\Core\{ Acl\Traits\DefaultAccessCheckerDependency, }; +/** + * @implements AccessEntityCREDChecker<\Espo\Entities\ScheduledJob> + */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/Acl/Webhook/AccessChecker.php b/application/Espo/Classes/Acl/Webhook/AccessChecker.php index c96f262a02..64bde2fe86 100644 --- a/application/Espo/Classes/Acl/Webhook/AccessChecker.php +++ b/application/Espo/Classes/Acl/Webhook/AccessChecker.php @@ -40,6 +40,9 @@ use Espo\Core\{ Acl\Traits\DefaultAccessCheckerDependency, }; +/** + * @implements AccessEntityCREDChecker<\Espo\Entities\Webhook> + */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/AclPortal/Email/AccessChecker.php b/application/Espo/Classes/AclPortal/Email/AccessChecker.php index 388db0e0cc..0ac201debd 100644 --- a/application/Espo/Classes/AclPortal/Email/AccessChecker.php +++ b/application/Espo/Classes/AclPortal/Email/AccessChecker.php @@ -43,6 +43,9 @@ use Espo\Core\{ Portal\Acl\Traits\DefaultAccessCheckerDependency, }; +/** + * @implements AccessEntityCREDSChecker<\Espo\Entities\Email> + */ class AccessChecker implements AccessEntityCREDSChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/AclPortal/Note/AccessChecker.php b/application/Espo/Classes/AclPortal/Note/AccessChecker.php index 7368b2f64a..da595a3f25 100644 --- a/application/Espo/Classes/AclPortal/Note/AccessChecker.php +++ b/application/Espo/Classes/AclPortal/Note/AccessChecker.php @@ -46,6 +46,9 @@ use Espo\Core\{ use DateTime; use Exception; +/** + * @implements AccessEntityCREDChecker<\Espo\Entities\Note> + */ class AccessChecker implements AccessEntityCREDChecker { use DefaultAccessCheckerDependency; diff --git a/application/Espo/Classes/AppParams/TemplateEntityTypeList.php b/application/Espo/Classes/AppParams/TemplateEntityTypeList.php index a3cd0bee11..f116006494 100644 --- a/application/Espo/Classes/AppParams/TemplateEntityTypeList.php +++ b/application/Espo/Classes/AppParams/TemplateEntityTypeList.php @@ -40,20 +40,11 @@ use Espo\Core\{ */ class TemplateEntityTypeList { - /** - * @var Acl - */ - protected $acl; + private $acl; - /** - * @var SelectBuilderFactory - */ - protected $selectBuilderFactory; + private $selectBuilderFactory; - /** - * @var EntityManager - */ - protected $entityManager; + private $entityManager; public function __construct(Acl $acl, SelectBuilderFactory $selectBuilderFactory, EntityManager $entityManager) { @@ -62,6 +53,9 @@ class TemplateEntityTypeList $this->entityManager = $entityManager; } + /** + * @return string[] + */ public function get(): array { if (!$this->acl->checkScope('Template')) { diff --git a/application/Espo/Classes/AssignmentNotificators/Email.php b/application/Espo/Classes/AssignmentNotificators/Email.php index f4e3bc4637..1c3366b356 100644 --- a/application/Espo/Classes/AssignmentNotificators/Email.php +++ b/application/Espo/Classes/AssignmentNotificators/Email.php @@ -55,7 +55,7 @@ class Email implements AssignmentNotificator { private const DAYS_THRESHOLD = 2; - private $streamService = null; + private ?StreamService $streamService = null; private $user; diff --git a/application/Espo/Classes/Cleanup/Exports.php b/application/Espo/Classes/Cleanup/Exports.php index 4590a52d9f..820cfd0381 100644 --- a/application/Espo/Classes/Cleanup/Exports.php +++ b/application/Espo/Classes/Cleanup/Exports.php @@ -43,7 +43,7 @@ class Exports implements Cleanup private $entityManager; - private $cleanupPeriod = '2 days'; + private string $cleanupPeriod = '2 days'; public function __construct(Config $config, EntityManager $entityManager) { diff --git a/application/Espo/Classes/Cleanup/MassActions.php b/application/Espo/Classes/Cleanup/MassActions.php index 84138278c7..a4779273c4 100644 --- a/application/Espo/Classes/Cleanup/MassActions.php +++ b/application/Espo/Classes/Cleanup/MassActions.php @@ -41,7 +41,7 @@ class MassActions implements Cleanup private $entityManager; - private $cleanupPeriod = '14 days'; + private string $cleanupPeriod = '14 days'; public function __construct(Config $config, EntityManager $entityManager) { diff --git a/application/Espo/Classes/Cleanup/Reminders.php b/application/Espo/Classes/Cleanup/Reminders.php index 1930c8c5de..fd45af27b6 100644 --- a/application/Espo/Classes/Cleanup/Reminders.php +++ b/application/Espo/Classes/Cleanup/Reminders.php @@ -41,7 +41,7 @@ class Reminders implements Cleanup private $entityManager; - private $cleanupRemindersPeriod = '15 days'; + private string $cleanupRemindersPeriod = '15 days'; public function __construct(Config $config, EntityManager $entityManager) { diff --git a/application/Espo/Classes/Cleanup/WebhookQueue.php b/application/Espo/Classes/Cleanup/WebhookQueue.php index f652fd7536..40968dd430 100644 --- a/application/Espo/Classes/Cleanup/WebhookQueue.php +++ b/application/Espo/Classes/Cleanup/WebhookQueue.php @@ -37,7 +37,7 @@ use DateTime; class WebhookQueue implements Cleanup { - private $cleanupWebhookQueuePeriod = '10 days'; + private string $cleanupWebhookQueuePeriod = '10 days'; private $config; diff --git a/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php b/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php index 23dff7537e..b88d601c7e 100644 --- a/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php +++ b/application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php @@ -33,32 +33,32 @@ use Espo\Core\Utils\Metadata; class DefaultSidePanelType { - protected $metadata; + private $metadata; public function __construct(Metadata $metadata) { $this->metadata = $metadata; } + /** + * @return \stdClass[] + */ public function get(string $scope): array { $list = []; if ( - $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link' - && + $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === 'link' && $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === 'User' || - $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple' - && + $this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUsers', 'type']) === 'linkMultiple' && $this->metadata->get(['entityDefs', $scope, 'links', 'assignedUsers', 'entity']) === 'User' ) { $list[] = (object) ['name' => ':assignedUser']; } if ( - $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple' - && + $this->metadata->get(['entityDefs', $scope, 'fields', 'teams', 'type']) === 'linkMultiple' && $this->metadata->get(['entityDefs', $scope, 'links', 'teams', 'entity']) === 'Team' ) { $list[] = (object) ['name' => 'teams']; diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Company.php b/application/Espo/Classes/DuplicateWhereBuilders/Company.php index 8b82e901cd..66c10d13f3 100644 --- a/application/Espo/Classes/DuplicateWhereBuilders/Company.php +++ b/application/Espo/Classes/DuplicateWhereBuilders/Company.php @@ -40,6 +40,9 @@ use Espo\ORM\{ Entity, }; +/** + * @implements WhereBuilder + */ class Company implements WhereBuilder { public function build(Entity $entity): ?WhereItem @@ -88,6 +91,9 @@ class Company implements WhereBuilder return $orBuilder->build(); } + /** + * @return string[] + */ private function getEmailAddressList(CoreEntity $entity): array { if ($entity->get('emailAddressData')) { diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Person.php b/application/Espo/Classes/DuplicateWhereBuilders/Person.php index c2c820b9d9..2bf772cdea 100644 --- a/application/Espo/Classes/DuplicateWhereBuilders/Person.php +++ b/application/Espo/Classes/DuplicateWhereBuilders/Person.php @@ -43,6 +43,9 @@ use Espo\ORM\{ Entity, }; +/** + * @implements WhereBuilder + */ class Person implements WhereBuilder { public function build(Entity $entity): ?WhereItem @@ -97,6 +100,9 @@ class Person implements WhereBuilder return $orBuilder->build(); } + /** + * @return string[] + */ private function getEmailAddressList(CoreEntity $entity): array { if ($entity->get('emailAddressData')) { diff --git a/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php b/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php index 6b1a5502d3..ad74199fc0 100644 --- a/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php +++ b/application/Espo/Classes/FieldDuplicators/AttachmentMultiple.php @@ -51,13 +51,13 @@ class AttachmentMultiple implements FieldDuplicator { $valueMap = (object) []; - /** @var \Espo\ORM\Collection&iterable $attachmentList */ + /** @var \Espo\ORM\Collection $attachmentList */ $attachmentList = $this->entityManager ->getRDBRepository($entity->getEntityType()) ->getRelation($entity, $field) ->find(); - if (!count($attachmentList)) { + if (is_countable($attachmentList) && !count($attachmentList)) { return $valueMap; } diff --git a/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php index 64e3b251f0..1e37c603af 100644 --- a/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/IcsDataLoader.php @@ -48,12 +48,18 @@ use ICal\Event; use Throwable; +/** + * @implements Loader<\Espo\Entities\Email> + */ class IcsDataLoader implements Loader { private $entityManager; private $log; + /** + * @var array + */ private $entityTypeLinkMap = [ 'User' => 'users', 'Contact' => 'contacts', diff --git a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php index a44f064a4a..05030a4581 100644 --- a/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/StringDataLoader.php @@ -42,12 +42,18 @@ use Espo\Core\{ use Espo\Entities\Email; use Espo\Entities\User; +/** + * @implements Loader<\Espo\Entities\Email> + */ class StringDataLoader implements Loader { private $entityManager; private $user; + /** + * @var array + */ private $fromEmailAddressNameCache = []; public function __construct(EntityManager $entityManager, User $user) diff --git a/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php b/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php index 4536d5cfe2..ef38f081bb 100644 --- a/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Email/UserColumnsLoader.php @@ -39,6 +39,9 @@ use Espo\Core\{ use Espo\Entities\User; +/** + * @implements Loader<\Espo\Entities\Email> + */ class UserColumnsLoader implements Loader { private $entityManager; diff --git a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php index 3818ad563d..039b819294 100644 --- a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php @@ -38,6 +38,9 @@ use Espo\Core\{ use Espo\Entities\Note; +/** + * @implements Loader<\Espo\Entities\Note> + */ class AttachmentsLoader implements Loader { public function process(Entity $entity, Params $params): void diff --git a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php index 9e53931f6f..241d4fc256 100644 --- a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php +++ b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php @@ -40,6 +40,9 @@ use Espo\Core\{ ORM\EntityManager, }; +/** + * @implements Loader<\Espo\Entities\Portal> + */ class UrlLoader implements Loader { private $entityManager; diff --git a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php index 2c4d9c8557..92ba2aff01 100644 --- a/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php +++ b/application/Espo/Classes/FieldProcessing/User/LastAccessLoader.php @@ -42,6 +42,9 @@ use Espo\Core\{ use DateTime; use Exception; +/** + * @implements Loader<\Espo\Entities\User> + */ class LastAccessLoader implements Loader { private $entityManager; diff --git a/application/Espo/Classes/FieldValidators/IntType.php b/application/Espo/Classes/FieldValidators/IntType.php index 388725fd05..4282603cef 100644 --- a/application/Espo/Classes/FieldValidators/IntType.php +++ b/application/Espo/Classes/FieldValidators/IntType.php @@ -38,6 +38,9 @@ class IntType return $this->isNotEmpty($entity, $field); } + /** + * @param mixed $validationValue + */ public function checkMax(Entity $entity, string $field, $validationValue): bool { if (!$this->isNotEmpty($entity, $field)) { @@ -51,6 +54,9 @@ class IntType return true; } + /** + * @param mixed $validationValue + */ public function checkMin(Entity $entity, string $field, $validationValue): bool { if (!$this->isNotEmpty($entity, $field)) { diff --git a/application/Espo/Classes/Jobs/CheckNewVersion.php b/application/Espo/Classes/Jobs/CheckNewVersion.php index ccf3ef4bd8..70b02388d3 100644 --- a/application/Espo/Classes/Jobs/CheckNewVersion.php +++ b/application/Espo/Classes/Jobs/CheckNewVersion.php @@ -76,7 +76,7 @@ class CheckNewVersion implements JobDataLess return; } - protected function getRunTime() + protected function getRunTime(): string { $hour = rand(0, 4); $minute = rand(0, 59); @@ -99,7 +99,7 @@ class CheckNewVersion implements JobDataLess * For backward compatibility. * @deprecated */ - protected function getEntityManager() + protected function getEntityManager() /** @phpstan-ignore-line */ { return $this->entityManager; } diff --git a/application/Espo/Classes/Jobs/Cleanup.php b/application/Espo/Classes/Jobs/Cleanup.php index d8357e9076..acf19ae955 100644 --- a/application/Espo/Classes/Jobs/Cleanup.php +++ b/application/Espo/Classes/Jobs/Cleanup.php @@ -53,23 +53,23 @@ use Throwable; class Cleanup implements JobDataLess { - private $cleanupJobPeriod = '10 days'; + private string $cleanupJobPeriod = '10 days'; - private $cleanupActionHistoryPeriod = '15 days'; + private string $cleanupActionHistoryPeriod = '15 days'; - private $cleanupAuthTokenPeriod = '1 month'; + private string $cleanupAuthTokenPeriod = '1 month'; - private $cleanupAuthLogPeriod = '2 months'; + private string $cleanupAuthLogPeriod = '2 months'; - private $cleanupNotificationsPeriod = '2 months'; + private string $cleanupNotificationsPeriod = '2 months'; - private $cleanupAttachmentsPeriod = '15 days'; + private string $cleanupAttachmentsPeriod = '15 days'; - private $cleanupAttachmentsFromPeriod = '3 months'; + private string $cleanupAttachmentsFromPeriod = '3 months'; - private $cleanupBackupPeriod = '2 month'; + private string $cleanupBackupPeriod = '2 month'; - private $cleanupDeletedRecordsPeriod = '3 months'; + private string $cleanupDeletedRecordsPeriod = '3 months'; private $config; @@ -134,6 +134,7 @@ class Cleanup implements JobDataLess foreach ($items as $name => $item) { try { + /** @var class-string */ $className = $item['className']; $injectableFactory->create($className)->process(); diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php index c071026e1a..38fba7dfb3 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php @@ -44,9 +44,9 @@ use Espo\{ class EmailAddressEquals implements ItemConverter { - protected $emailAddressHelper; + private $emailAddressHelper; - protected $randomStringGenerator; + private $randomStringGenerator; public function __construct( EmailAddressHelper $emailAddressHelper, diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php index 6c92ce1868..ff2d4c6441 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/InFolder.php @@ -45,20 +45,11 @@ use Espo\{ class InFolder implements ItemConverter { - /** - * @var User - */ - protected $user; + private User $user; - /** - * @var EntityManager - */ - protected $entityManager; + private EntityManager $entityManager; - /** - * @var JoinHelper - */ - protected $joinHelper; + private JoinHelper $joinHelper; public function __construct(User $user, EntityManager $entityManager, JoinHelper $joinHelper) { @@ -173,7 +164,7 @@ class InFolder implements ItemConverter { return WhereClause::fromRaw([ 'status' => 'Draft', - 'createdById' => $this->user->id, + 'createdById' => $this->user->getId(), ]); } @@ -187,11 +178,14 @@ class InFolder implements ItemConverter ]); } - protected function joinEmailUser(QueryBuilder $queryBuilder) + protected function joinEmailUser(QueryBuilder $queryBuilder): void { - $this->joinHelper->joinEmailUser($queryBuilder, $this->user->id); + $this->joinHelper->joinEmailUser($queryBuilder, $this->user->getId()); } + /** + * @return string[] + */ protected function getEmailAddressIdList(): array { $emailAddressList = $this->entityManager diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php index 0ddcbbf2ca..97664fcaca 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php @@ -44,9 +44,9 @@ use Espo\{ class IsImportantIsFalse implements ItemConverter { - protected $user; + private $user; - protected $joinHelper; + private $joinHelper; public function __construct(User $user, JoinHelper $joinHelper) { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php index 60fa68f684..cf42b8376b 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php @@ -44,9 +44,9 @@ use Espo\{ class IsImportantIsTrue implements ItemConverter { - protected $user; + private $user; - protected $joinHelper; + private $joinHelper; public function __construct(User $user, JoinHelper $joinHelper) { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php index aa4ba25585..adb582e930 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php @@ -44,9 +44,9 @@ use Espo\{ class IsNotReadIsFalse implements ItemConverter { - protected $user; + private $user; - protected $joinHelper; + private $joinHelper; public function __construct(User $user, JoinHelper $joinHelper) { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php index 5cfd0adc75..69184a1ecc 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php @@ -44,9 +44,9 @@ use Espo\{ class IsNotReadIsTrue implements ItemConverter { - protected $user; + private $user; - protected $joinHelper; + private $joinHelper; public function __construct(User $user, JoinHelper $joinHelper) { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php index ff9b27e7b9..b69c749678 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php @@ -44,9 +44,9 @@ use Espo\{ class ToEquals implements ItemConverter { - protected $emailAddressHelper; + private $emailAddressHelper; - protected $randomStringGenerator; + private $randomStringGenerator; public function __construct( EmailAddressHelper $emailAddressHelper,