espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

type fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-11-05 10:55:41 +02:00
parent 1997da4343
commit beb51081d3
13 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Repositories/Preferences.php
+1 -1
View File
@@ -258,7 +258,7 @@ class Preferences implements Repository,
$this->entityManager->getQueryExecutor()->execute($insert);
/** @var User $user */
/** @var User|null $user */
$user = $this->entityManager->getEntity('User', $entity->getId());
if ($user && !$user->isPortal()) {
application/Espo/Services/DashboardTemplate.php
+1 -1
View File
@@ -96,7 +96,7 @@ class DashboardTemplate extends Record
}
foreach ($userIdList as $userId) {
/** @var User $user */
/** @var User|null $user */
$user = $this->getEntityManager()->getEntity('User', $userId);
if ($user) {
application/Espo/Services/Email.php
+8 -10
View File
@@ -117,7 +117,7 @@ class Email extends Record implements
$fromAddress = strtolower($fromAddress);
}
/** @var Preferences $preferences */
/** @var Preferences|null $preferences */
$preferences = $this->entityManager->getEntity('Preferences', $user->getId());
if (!$preferences) {
@@ -190,7 +190,7 @@ class Email extends Record implements
$primaryUserAddress = strtolower($user->get('emailAddress'));
if ($primaryUserAddress === $fromAddress) {
/** @var Preferences $preferences */
/** @var Preferences|null $preferences */
$preferences = $this->entityManager->getEntity('Preferences', $user->getId());
if ($preferences) {
@@ -221,9 +221,7 @@ class Email extends Record implements
if ($user) {
if ($smtpParams) {
if ($fromAddress) {
$this->applySmtpHandler($user->getId(), $fromAddress, $smtpParams);
}
$this->applySmtpHandler($user->getId(), $fromAddress, $smtpParams);
$emailSender->withSmtpParams($smtpParams);
}
@@ -434,7 +432,7 @@ class Email extends Record implements
{
$entity = parent::create($data, $params);
if ($entity && $entity->get('status') === EmailEntity::STATUS_SENDING) {
if ($entity->get('status') === EmailEntity::STATUS_SENDING) {
$this->sendEntity($entity, $this->getUser());
}
@@ -452,7 +450,7 @@ class Email extends Record implements
protected function afterUpdateEntity(Entity $entity, $data)
{
if ($entity && $entity->get('status') === EmailEntity::STATUS_SENDING) {
if ($entity->get('status') === EmailEntity::STATUS_SENDING) {
$this->sendEntity($entity, $this->getUser());
}
@@ -773,7 +771,7 @@ class Email extends Record implements
throw new BadRequest();
}
/** @var EmailEntity $email */
/** @var EmailEntity|null $email */
$email = $this->entityManager->getEntity(EmailEntity::ENTITY_TYPE, $id);
if (!$email) {
@@ -789,7 +787,7 @@ class Email extends Record implements
$attachmentsIds = $email->get('attachmentsIds');
foreach ($attachmentsIds as $attachmentId) {
/** @var Attachment $source */
/** @var Attachment|null $source */
$source = $this->entityManager->getEntity('Attachment', $attachmentId);
if ($source) {
@@ -1014,7 +1012,7 @@ class Email extends Record implements
return null;
}
/** @var EmailEntity $replied */
/** @var EmailEntity|null $replied */
$replied = $this->entityManager
->getRDBRepository('Email')
->select(['messageId'])
application/Espo/Services/EmailAccount.php
+4 -6
View File
@@ -252,14 +252,12 @@ class EmailAccount extends Record implements
$entity = parent::create($data, $params);
if ($entity) {
if (!$this->getUser()->isAdmin()) {
$entity->set('assignedUserId', $this->getUser()->getId());
}
$this->entityManager->saveEntity($entity);
if (!$this->getUser()->isAdmin()) {
$entity->set('assignedUserId', $this->getUser()->getId());
}
$this->entityManager->saveEntity($entity);
return $entity;
}
application/Espo/Services/ExternalAccount.php
+1 -1
View File
@@ -54,7 +54,7 @@ class ExternalAccount extends Record implements Di\HookManagerAware
protected function getClient(string $integration, string $id)
{
/** @var IntegrationEntity $integrationEntity */
/** @var IntegrationEntity|null $integrationEntity */
$integrationEntity = $this->entityManager->getEntity('Integration', $integration);
if (!$integrationEntity) {
application/Espo/Services/InboundEmail.php
+1 -1
View File
@@ -371,7 +371,7 @@ class InboundEmail extends RecordService implements
if (preg_match('/MAILER-DAEMON|POSTMASTER/i', $fromString)) {
try {
$toSkip = $this->processBouncedMessage($message) || $toSkip;
$toSkip = $this->processBouncedMessage($message);
}
catch (Throwable $e) {
$this->log->error(
application/Espo/Services/Notification.php
+3 -3
View File
@@ -159,7 +159,7 @@ class Notification extends \Espo\Services\Record
switch ($entity->get('type')) {
case 'Note':
case 'MentionInPost':
/** @var Note $note */
/** @var ?Note $note */
$note = $this->entityManager->getEntity('Note', $data->noteId);
if (!$note) {
@@ -242,11 +242,11 @@ class Notification extends \Espo\Services\Record
$scopes = $this->metadata->get('scopes', []);
foreach ($scopes as $scope => $d) {
if (empty($d['entity']) || !$d['entity']) {
if (empty($d['entity'])) {
continue;
}
if (empty($d['object']) || !$d['object']) {
if (empty($d['object'])) {
continue;
}
application/Espo/Services/Preferences.php
+4 -4
View File
@@ -88,9 +88,9 @@ class Preferences
{
$this->processAccessCheck($userId);
/** @var PreferencesEntity $entity */
/** @var ?PreferencesEntity $entity */
$entity = $this->entityManager->getEntity('Preferences', $userId);
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $userId);
if (!$entity || !$user) {
@@ -134,7 +134,7 @@ class Preferences
$user = $this->entityManager->getEntity('User', $userId);
/** @var PreferencesEntity */
/** @var ?PreferencesEntity */
$entity = $this->entityManager->getEntity('Preferences', $userId);
if (!$entity || !$user) {
@@ -172,7 +172,7 @@ class Preferences
throw new Forbidden();
}
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $userId);
$preferences = $this->entityManager->getEntity('Preferences', $userId);
application/Espo/Services/Stream.php
+1 -1
View File
@@ -380,7 +380,7 @@ class Stream
$user = $this->user;
}
else {
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $userId);
if (!$user) {
application/Espo/Services/User.php
+4 -4
View File
@@ -81,7 +81,7 @@ class User extends Record implements
throw new Forbidden();
}
/** @var UserEntity $entity */
/** @var ?UserEntity $entity */
$entity = parent::getEntity($id);
if ($entity && $entity->isSuperAdmin() && !$this->getUser()->isSuperAdmin()) {
@@ -102,7 +102,7 @@ class User extends Record implements
?string $currentPassword = null
): void {
/** @var UserEntity $user */
/** @var ?UserEntity $user */
$user = $this->getEntityManager()->getEntity('User', $userId);
if (!$user) {
@@ -374,7 +374,7 @@ class User extends Record implements
public function generateNewApiKeyForEntity(string $id): Entity
{
/** @var UserEntity $entity */
/** @var ?UserEntity $entity */
$entity = $this->getEntity($id);
if (!$entity) {
@@ -414,7 +414,7 @@ class User extends Record implements
}
}
/** @var UserEntity $user */
/** @var ?UserEntity $user */
$user = $this->getEntity($id);
if (!$user) {
application/Espo/Services/UserSecurity.php
+3 -3
View File
@@ -87,7 +87,7 @@ class UserSecurity
throw new Forbidden();
}
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $id);
if (!$user) {
@@ -114,7 +114,7 @@ class UserSecurity
$isReset = $data->reset ?? false;
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $id);
if (!$user) {
@@ -163,7 +163,7 @@ class UserSecurity
throw new Forbidden();
}
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $id);
if (!$user) {
application/Espo/Services/Webhook.php
+1 -1
View File
@@ -123,7 +123,7 @@ class Webhook extends Record implements
return;
}
/** @var User $user */
/** @var ?User $user */
$user = $this->getEntityManager()->getEntity('User', $userId);
if (!$user || !$user->isApi()) {
application/Espo/Tools/EmailNotification/AssignmentProcessor.php
+1 -1
View File
@@ -106,7 +106,7 @@ class AssignmentProcessor
throw new LogicException();
}
/** @var User $user */
/** @var ?User $user */
$user = $this->entityManager->getEntity('User', $userId);
if (!$user) {