From 4e1f421dc13c9cc84ab78c2730ec3f1ee0cf0a54 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 9 Nov 2021 17:13:25 +0200 Subject: [PATCH] fixes and cleanup --- .../Espo/Classes/AclPortal/Email/AccessChecker.php | 7 +------ .../AssignmentChecker/AssignmentCheckerFactory.php | 5 ----- .../AssignmentChecker/AssignmentCheckerManager.php | 10 ++-------- application/Espo/Core/Acl/FieldData.php | 7 +++++-- application/Espo/Core/Api/ErrorOutput.php | 4 ++-- .../Espo/Core/ApplicationRunners/Daemon.php | 2 +- application/Espo/Core/Console/Commands/Upgrade.php | 2 +- application/Espo/Core/EntryPoint/Starter.php | 6 ------ .../ExternalAccount/Clients/OAuth2Abstract.php | 2 +- application/Espo/Core/Htmlizer/Htmlizer.php | 3 +++ .../Espo/Core/Htmlizer/TemplateRenderer.php | 12 +++++++++++- application/Espo/Core/Job/JobManager.php | 5 ----- application/Espo/Core/Mail/Event/EventFactory.php | 2 +- .../Espo/Core/MassAction/Actions/MassUnfollow.php | 5 ----- .../Espo/Core/Portal/Acl/DefaultAccessChecker.php | 5 ----- application/Espo/Core/Portal/Application.php | 4 ---- application/Espo/Core/Repositories/Event.php | 1 - .../Select/AccessControl/DefaultFilterResolver.php | 10 ++-------- .../AccessControl/DefaultPortalFilterResolver.php | 10 ++-------- .../Core/Select/AccessControl/Filters/OnlyOwn.php | 5 +---- .../Core/Select/AccessControl/Filters/OnlyTeam.php | 5 +---- .../AccessControl/Filters/PortalOnlyAccount.php | 5 +---- .../AccessControl/Filters/PortalOnlyContact.php | 5 +---- .../Select/AccessControl/Filters/PortalOnlyOwn.php | 7 ++----- .../Core/Select/Applier/Appliers/TextFilter.php | 5 ----- .../Core/Select/Helpers/UserTimeZoneProvider.php | 2 +- .../Espo/Core/Utils/AdminNotificationManager.php | 2 +- .../Espo/Core/Utils/Autoload/NamespaceLoader.php | 2 +- application/Espo/Core/Utils/Crypt.php | 4 ---- application/Espo/Core/Utils/Language.php | 5 ----- .../Espo/Core/Utils/TemplateFileManager.php | 4 ---- application/Espo/Core/WebSocket/ServerStarter.php | 3 --- application/Espo/Hooks/User/ApiKey.php | 2 +- .../Classes/AclPortal/Account/OwnershipChecker.php | 7 ------- .../Espo/Modules/Crm/Controllers/Activities.php | 9 ++------- application/Espo/Modules/Crm/Services/Contact.php | 2 +- .../Espo/Modules/Crm/Tools/MassEmail/Processor.php | 14 +++++--------- 37 files changed, 50 insertions(+), 140 deletions(-) diff --git a/application/Espo/Classes/AclPortal/Email/AccessChecker.php b/application/Espo/Classes/AclPortal/Email/AccessChecker.php index 211bcea45a..c1a80aa354 100644 --- a/application/Espo/Classes/AclPortal/Email/AccessChecker.php +++ b/application/Espo/Classes/AclPortal/Email/AccessChecker.php @@ -36,7 +36,6 @@ use Espo\ORM\Entity; use Espo\Core\ORM\Entity as CoreEntity; use Espo\Core\{ - Portal\AclManager, Acl\Table, Acl\ScopeData, Acl\AccessEntityCREDSChecker, @@ -50,14 +49,10 @@ class AccessChecker implements AccessEntityCREDSChecker private $defaultAccessChecker; - private $aclManager; - public function __construct( - DefaultAccessChecker $defaultAccessChecker, - AclManager $aclManager + DefaultAccessChecker $defaultAccessChecker ) { $this->defaultAccessChecker = $defaultAccessChecker; - $this->aclManager = $aclManager; } public function checkEntityRead(User $user, Entity $entity, ScopeData $data): bool diff --git a/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerFactory.php b/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerFactory.php index 6928b3d62a..fa5eb99524 100644 --- a/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerFactory.php +++ b/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerFactory.php @@ -30,7 +30,6 @@ namespace Espo\Core\Acl\AssignmentChecker; use Espo\Core\{ - Utils\ClassFinder, Utils\Metadata, InjectableFactory, Acl\AssignmentChecker, @@ -42,18 +41,14 @@ class AssignmentCheckerFactory { private $defaultClassName = DefaultAssignmentChecker::class; - private $classFinder; - private $metadata; private $injectableFactory; public function __construct( - ClassFinder $classFinder, Metadata $metadata, InjectableFactory $injectableFactory ) { - $this->classFinder = $classFinder; $this->metadata = $metadata; $this->injectableFactory = $injectableFactory; } diff --git a/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerManager.php b/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerManager.php index 85fb73b36a..f967a8d263 100644 --- a/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerManager.php +++ b/application/Espo/Core/Acl/AssignmentChecker/AssignmentCheckerManager.php @@ -33,22 +33,16 @@ use Espo\ORM\Entity; use Espo\Entities\User; -use Espo\Core\{ - Utils\Metadata, - Acl\AssignmentChecker, -}; +use Espo\Core\Acl\AssignmentChecker; class AssignmentCheckerManager { private $checkerCache = []; - private $metadata; - private $factory; - public function __construct(Metadata $metadata, AssignmentCheckerFactory $factory) + public function __construct(AssignmentCheckerFactory $factory) { - $this->metadata = $metadata; $this->factory = $factory; } diff --git a/application/Espo/Core/Acl/FieldData.php b/application/Espo/Core/Acl/FieldData.php index 1dbad91e6e..99569c30d9 100644 --- a/application/Espo/Core/Acl/FieldData.php +++ b/application/Espo/Core/Acl/FieldData.php @@ -29,7 +29,7 @@ namespace Espo\Core\Acl; -use StdClass; +use stdClass; use RuntimeException; /** @@ -37,6 +37,9 @@ use RuntimeException; */ class FieldData { + /** + * @phpstan-ignore-next-line + */ private $raw; private $actionData = []; @@ -77,7 +80,7 @@ class FieldData /** * Create from a raw table value. */ - public static function fromRaw(StdClass $raw): self + public static function fromRaw(stdClass $raw): self { $obj = new self(); diff --git a/application/Espo/Core/Api/ErrorOutput.php b/application/Espo/Core/Api/ErrorOutput.php index 3dee6002c1..1feddefd18 100644 --- a/application/Espo/Core/Api/ErrorOutput.php +++ b/application/Espo/Core/Api/ErrorOutput.php @@ -109,7 +109,7 @@ class ErrorOutput bool $toPrintBody = false ): void { - $message = $exception->getMessage() ?? ''; + $message = $exception->getMessage(); $statusCode = $exception->getCode(); if ($route) { @@ -225,7 +225,7 @@ class ErrorOutput { $requestBodyString = $this->clearPasswords($request->getBodyContents()); - $message = $exception->getMessage() ?? ''; + $message = $exception->getMessage(); $statusCode = $exception->getCode(); $routeParams = $request->getRouteParams(); diff --git a/application/Espo/Core/ApplicationRunners/Daemon.php b/application/Espo/Core/ApplicationRunners/Daemon.php index ea318ecbf7..4ded0d5074 100644 --- a/application/Espo/Core/ApplicationRunners/Daemon.php +++ b/application/Espo/Core/ApplicationRunners/Daemon.php @@ -77,7 +77,7 @@ class Daemon implements Runner $processList = []; - while (true) { + while (true) { /** @phpstan-ignore-line */ $toSkip = false; $runningCount = 0; diff --git a/application/Espo/Core/Console/Commands/Upgrade.php b/application/Espo/Core/Console/Commands/Upgrade.php index bebeef3fdc..f95dc23ccb 100644 --- a/application/Espo/Core/Console/Commands/Upgrade.php +++ b/application/Espo/Core/Console/Commands/Upgrade.php @@ -406,7 +406,7 @@ class Upgrade implements Command try { $data = json_decode($result); } - catch (Exception $e) { + catch (Exception $e) { /** @phpstan-ignore-line */ echo "Could not parse info about next version.\n"; return null; diff --git a/application/Espo/Core/EntryPoint/Starter.php b/application/Espo/Core/EntryPoint/Starter.php index 595673653d..40842b7ea1 100644 --- a/application/Espo/Core/EntryPoint/Starter.php +++ b/application/Espo/Core/EntryPoint/Starter.php @@ -44,8 +44,6 @@ use Espo\Core\Utils\Route; use Espo\Core\Utils\ClientManager; use Espo\Core\ApplicationRunners\EntryPoint as EntryPointRunner; -use Espo\ORM\EntityManager; - use Slim\ResponseEmitter; use Slim\Factory\ServerRequestCreatorFactory; use Slim\Psr7\Response; @@ -61,8 +59,6 @@ class Starter private $entryPointManager; - private $entityManager; - private $clientManager; private $applicationUser; @@ -76,7 +72,6 @@ class Starter public function __construct( AuthenticationFactory $authenticationFactory, EntryPointManager $entryPointManager, - EntityManager $entityManager, ClientManager $clientManager, ApplicationUser $applicationUser, AuthTokenManager $authTokenManager, @@ -85,7 +80,6 @@ class Starter ) { $this->authenticationFactory = $authenticationFactory; $this->entryPointManager = $entryPointManager; - $this->entityManager = $entityManager; $this->clientManager = $clientManager; $this->applicationUser = $applicationUser; $this->authTokenManager = $authTokenManager; diff --git a/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php b/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php index 633ba46736..5c1d2e8a66 100644 --- a/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php +++ b/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php @@ -249,7 +249,7 @@ abstract class OAuth2Abstract implements IClient while (true) { usleep($this::LOCK_CHECK_STEP * 1000000); - if (!$this->isLocked()) { + if (!$this->isLocked()) { /** @phpstan-ignore-line */ $this->log->debug("Oauth: Waited until unlocked for client {$this->clientId}."); $this->reFetch(); diff --git a/application/Espo/Core/Htmlizer/Htmlizer.php b/application/Espo/Core/Htmlizer/Htmlizer.php index 9809bcaafd..527ef30d3b 100644 --- a/application/Espo/Core/Htmlizer/Htmlizer.php +++ b/application/Espo/Core/Htmlizer/Htmlizer.php @@ -65,6 +65,9 @@ use const JSON_PRESERVE_ZERO_FRACTION; */ class Htmlizer { + /** + * @phpstan-ignore-next-line + */ private $fileManager; private $dateTime; diff --git a/application/Espo/Core/Htmlizer/TemplateRenderer.php b/application/Espo/Core/Htmlizer/TemplateRenderer.php index 2cd3d9c5bb..60c1b9d040 100644 --- a/application/Espo/Core/Htmlizer/TemplateRenderer.php +++ b/application/Espo/Core/Htmlizer/TemplateRenderer.php @@ -55,7 +55,10 @@ class TemplateRenderer private $applicationState; - private $template; + /** + * @var ?string + */ + private $template = null; public function __construct(HtmlizerFactory $htmlizerFactory, ApplicationState $applicationState) { @@ -118,6 +121,13 @@ class TemplateRenderer return $this; } + public function setTemplate(string $template): self + { + $this->template = $template; + + return $this; + } + public function render(): string { if (!$this->template) { diff --git a/application/Espo/Core/Job/JobManager.php b/application/Espo/Core/Job/JobManager.php index 18292eb7bb..62e1c963de 100644 --- a/application/Espo/Core/Job/JobManager.php +++ b/application/Espo/Core/Job/JobManager.php @@ -32,7 +32,6 @@ namespace Espo\Core\Job; use Espo\Core\{ Utils\Config, Utils\File\Manager as FileManager, - ORM\EntityManager, Utils\Log, }; @@ -55,8 +54,6 @@ class JobManager private $fileManager; - private $entityManager; - private $jobRunner; private $log; @@ -72,7 +69,6 @@ class JobManager public function __construct( Config $config, FileManager $fileManager, - EntityManager $entityManager, JobRunner $jobRunner, Log $log, ScheduleProcessor $scheduleProcessor, @@ -82,7 +78,6 @@ class JobManager ) { $this->config = $config; $this->fileManager = $fileManager; - $this->entityManager = $entityManager; $this->jobRunner = $jobRunner; $this->log = $log; $this->scheduleProcessor = $scheduleProcessor; diff --git a/application/Espo/Core/Mail/Event/EventFactory.php b/application/Espo/Core/Mail/Event/EventFactory.php index 0d40e9c355..bd97eeba97 100644 --- a/application/Espo/Core/Mail/Event/EventFactory.php +++ b/application/Espo/Core/Mail/Event/EventFactory.php @@ -63,7 +63,7 @@ class EventFactory ->withName($event->summary ?? null) ->withLocation($event->location ?? null) ->withDescription($event->description ?? null) - ->withTimezone($ical->calendarTimeZone() ?? null) + ->withTimezone($ical->calendarTimeZone() ?? null) /** @phpstan-ignore-line */ ->withOrganizer($event->organizer ?? null) ->withAttendees($event->attendee ?? null); diff --git a/application/Espo/Core/MassAction/Actions/MassUnfollow.php b/application/Espo/Core/MassAction/Actions/MassUnfollow.php index e496d199dd..ac4513a78a 100644 --- a/application/Espo/Core/MassAction/Actions/MassUnfollow.php +++ b/application/Espo/Core/MassAction/Actions/MassUnfollow.php @@ -37,7 +37,6 @@ use Espo\Core\{ MassAction\Result, MassAction\Data, MassAction\MassAction, - Acl, ORM\EntityManager, Exceptions\Forbidden, }; @@ -50,8 +49,6 @@ class MassUnfollow implements MassAction { private $queryBuilder; - private $acl; - private $streamService; private $entityManager; @@ -60,13 +57,11 @@ class MassUnfollow implements MassAction public function __construct( QueryBuilder $queryBuilder, - Acl $acl, StreamService $streamService, EntityManager $entityManager, User $user ) { $this->queryBuilder = $queryBuilder; - $this->acl = $acl; $this->streamService = $streamService; $this->entityManager = $entityManager; $this->user = $user; diff --git a/application/Espo/Core/Portal/Acl/DefaultAccessChecker.php b/application/Espo/Core/Portal/Acl/DefaultAccessChecker.php index fe58a5ea4c..5184ef37b4 100644 --- a/application/Espo/Core/Portal/Acl/DefaultAccessChecker.php +++ b/application/Espo/Core/Portal/Acl/DefaultAccessChecker.php @@ -34,7 +34,6 @@ use Espo\Entities\User; use Espo\ORM\Entity; use Espo\Core\{ - Utils\Config, Portal\AclManager as PortalAclManager, Portal\Acl\AccessChecker\ScopeChecker, Portal\Acl\AccessChecker\ScopeCheckerData, @@ -59,17 +58,13 @@ class DefaultAccessChecker implements { private $aclManager; - private $config; - private $scopeChecker; public function __construct( PortalAclManager $aclManager, - Config $config, ScopeChecker $scopeChecker ) { $this->aclManager = $aclManager; - $this->config = $config; $this->scopeChecker = $scopeChecker; } diff --git a/application/Espo/Core/Portal/Application.php b/application/Espo/Core/Portal/Application.php index e2b3e208f5..c105f67b3a 100644 --- a/application/Espo/Core/Portal/Application.php +++ b/application/Espo/Core/Portal/Application.php @@ -45,8 +45,6 @@ use Espo\Core\{ class Application extends BaseApplication { - private $portal; - public function __construct(?string $portalId) { date_default_timezone_set('UTC'); @@ -93,8 +91,6 @@ class Application extends BaseApplication throw new Forbidden("Portal {$portalId} is not active."); } - $this->portal = $portal; - $this->container->setPortal($portal); } diff --git a/application/Espo/Core/Repositories/Event.php b/application/Espo/Core/Repositories/Event.php index 468b5be2f4..5b612ca51d 100644 --- a/application/Espo/Core/Repositories/Event.php +++ b/application/Espo/Core/Repositories/Event.php @@ -107,7 +107,6 @@ class Event extends Database implements $this->preserveDuration && $entity->isAttributeChanged('dateStart') && $entity->get('dateStart') && - $entity->isAttributeChanged('dateStart') && !$entity->isAttributeChanged('dateEnd') ) { $dateEndPrevious = $entity->getFetched('dateEnd'); diff --git a/application/Espo/Core/Select/AccessControl/DefaultFilterResolver.php b/application/Espo/Core/Select/AccessControl/DefaultFilterResolver.php index 63db8e5ea7..6155db1e54 100644 --- a/application/Espo/Core/Select/AccessControl/DefaultFilterResolver.php +++ b/application/Espo/Core/Select/AccessControl/DefaultFilterResolver.php @@ -29,23 +29,17 @@ namespace Espo\Core\Select\AccessControl; -use Espo\{ - Core\Acl, - Entities\User, -}; +use Espo\Core\Acl; class DefaultFilterResolver implements FilterResolver { private $entityType; - private $user; - private $acl; - public function __construct(string $entityType, User $user, Acl $acl) + public function __construct(string $entityType, Acl $acl) { $this->entityType = $entityType; - $this->user = $user; $this->acl = $acl; } diff --git a/application/Espo/Core/Select/AccessControl/DefaultPortalFilterResolver.php b/application/Espo/Core/Select/AccessControl/DefaultPortalFilterResolver.php index 3e7b3d18b2..d27a3f2784 100644 --- a/application/Espo/Core/Select/AccessControl/DefaultPortalFilterResolver.php +++ b/application/Espo/Core/Select/AccessControl/DefaultPortalFilterResolver.php @@ -29,23 +29,17 @@ namespace Espo\Core\Select\AccessControl; -use Espo\{ - Core\Portal\Acl, - Entities\User, -}; +use Espo\Core\Portal\Acl; class DefaultPortalFilterResolver implements FilterResolver { private $entityType; - private $user; - private $acl; - public function __construct(string $entityType, User $user, Acl $acl) + public function __construct(string $entityType, Acl $acl) { $this->entityType = $entityType; - $this->user = $user; $this->acl = $acl; } diff --git a/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php b/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php index 51aad0b67c..55dd4e6267 100644 --- a/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php +++ b/application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php @@ -38,15 +38,12 @@ use Espo\{ class OnlyOwn implements Filter { - private $entityType; - private $user; private $fieldHelper; - public function __construct(string $entityType, User $user, FieldHelper $fieldHelper) + public function __construct(User $user, FieldHelper $fieldHelper) { - $this->entityType = $entityType; $this->user = $user; $this->fieldHelper = $fieldHelper; } diff --git a/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php b/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php index 560e5eee6c..55403c8396 100644 --- a/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php +++ b/application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php @@ -38,15 +38,12 @@ use Espo\{ class OnlyTeam implements Filter { - private $entityType; - private $user; private $fieldHelper; - public function __construct(string $entityType, User $user, FieldHelper $fieldHelper) + public function __construct(User $user, FieldHelper $fieldHelper) { - $this->entityType = $entityType; $this->user = $user; $this->fieldHelper = $fieldHelper; } diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php index e817435e90..1f583b9867 100644 --- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php +++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyAccount.php @@ -38,15 +38,12 @@ use Espo\{ class PortalOnlyAccount implements Filter { - private $entityType; - private $user; private $fieldHelper; - public function __construct(string $entityType, User $user, FieldHelper $fieldHelper) + public function __construct(User $user, FieldHelper $fieldHelper) { - $this->entityType = $entityType; $this->user = $user; $this->fieldHelper = $fieldHelper; } diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php index 05d00352c8..8cc49a6b53 100644 --- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php +++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyContact.php @@ -38,15 +38,12 @@ use Espo\{ class PortalOnlyContact implements Filter { - private $entityType; - private $user; private $fieldHelper; - public function __construct(string $entityType, User $user, FieldHelper $fieldHelper) + public function __construct(User $user, FieldHelper $fieldHelper) { - $this->entityType = $entityType; $this->user = $user; $this->fieldHelper = $fieldHelper; } diff --git a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php index 2568152e9f..93a417ae65 100644 --- a/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php +++ b/application/Espo/Core/Select/AccessControl/Filters/PortalOnlyOwn.php @@ -38,15 +38,12 @@ use Espo\{ class PortalOnlyOwn implements Filter { - private $entityType; - private $user; private $fieldHelper; - public function __construct(string $entityType, User $user, FieldHelper $fieldHelper) + public function __construct(User $user, FieldHelper $fieldHelper) { - $this->entityType = $entityType; $this->user = $user; $this->fieldHelper = $fieldHelper; } @@ -55,7 +52,7 @@ class PortalOnlyOwn implements Filter { if ($this->fieldHelper->hasCreatedByField()) { $queryBuilder->where([ - 'createdById' => $this->user->id, + 'createdById' => $this->user->getId(), ]); return; diff --git a/application/Espo/Core/Select/Applier/Appliers/TextFilter.php b/application/Espo/Core/Select/Applier/Appliers/TextFilter.php index 0dd0260b0a..3c7e63e2e8 100644 --- a/application/Espo/Core/Select/Applier/Appliers/TextFilter.php +++ b/application/Espo/Core/Select/Applier/Appliers/TextFilter.php @@ -29,7 +29,6 @@ namespace Espo\Core\Select\Applier\Appliers; -use Espo\Core\Utils\Config; use Espo\Core\Select\Text\MetadataProvider; use Espo\Core\Select\Text\FilterParams; use Espo\Core\Select\Text\FullTextSearchData; @@ -64,8 +63,6 @@ class TextFilter private $user; - private $config; - private $metadataProvider; private $fullTextSearchDataComposerFactory; @@ -75,14 +72,12 @@ class TextFilter public function __construct( string $entityType, User $user, - Config $config, MetadataProvider $metadataProvider, FullTextSearchDataComposerFactory $fullTextSearchDataComposerFactory, FilterFactory $filterFactory ) { $this->entityType = $entityType; $this->user = $user; - $this->config = $config; $this->metadataProvider = $metadataProvider; $this->fullTextSearchDataComposerFactory = $fullTextSearchDataComposerFactory; $this->filterFactory = $filterFactory; diff --git a/application/Espo/Core/Select/Helpers/UserTimeZoneProvider.php b/application/Espo/Core/Select/Helpers/UserTimeZoneProvider.php index 6342b79059..3fde5c2e6c 100644 --- a/application/Espo/Core/Select/Helpers/UserTimeZoneProvider.php +++ b/application/Espo/Core/Select/Helpers/UserTimeZoneProvider.php @@ -61,6 +61,6 @@ class UserTimeZoneProvider return $this->config->get('timeZone'); } - return $preferences->get('timeZone') ?? 'UTC'; + return $preferences->get('timeZone'); } } diff --git a/application/Espo/Core/Utils/AdminNotificationManager.php b/application/Espo/Core/Utils/AdminNotificationManager.php index 42c1b1f4db..1cfe874ace 100644 --- a/application/Espo/Core/Utils/AdminNotificationManager.php +++ b/application/Espo/Core/Utils/AdminNotificationManager.php @@ -95,7 +95,7 @@ class AdminNotificationManager } if ($this->config->get('adminNotificationsNewExtensionVersion')) { - $extensionsNeedingUpgrade = $this->getExtensionsNeedingUpgrade() ?? []; + $extensionsNeedingUpgrade = $this->getExtensionsNeedingUpgrade(); foreach ($extensionsNeedingUpgrade as $extensionName => $extensionDetails) { $label = 'new' . Util::toCamelCase($extensionName, ' ', true) . 'VersionIsAvailable'; diff --git a/application/Espo/Core/Utils/Autoload/NamespaceLoader.php b/application/Espo/Core/Utils/Autoload/NamespaceLoader.php index 3b1d776e38..59bc967017 100644 --- a/application/Espo/Core/Utils/Autoload/NamespaceLoader.php +++ b/application/Espo/Core/Utils/Autoload/NamespaceLoader.php @@ -123,7 +123,7 @@ class NamespaceLoader { $namespaces = $this->getNamespaces(); - return array_keys($namespaces[$type]) ?? []; + return array_keys($namespaces[$type]); } private function addNamespace(string $type, string $name, $path): void diff --git a/application/Espo/Core/Utils/Crypt.php b/application/Espo/Core/Utils/Crypt.php index 075e598af4..5418f9c488 100644 --- a/application/Espo/Core/Utils/Crypt.php +++ b/application/Espo/Core/Utils/Crypt.php @@ -33,8 +33,6 @@ use RuntimeException; class Crypt { - private $config; - private $key = null; private $cryptKey = null; @@ -43,8 +41,6 @@ class Crypt public function __construct(Config $config) { - $this->config = $config; - $this->cryptKey = $config->get('cryptKey', ''); } diff --git a/application/Espo/Core/Utils/Language.php b/application/Espo/Core/Utils/Language.php index 95d46008a6..a4bb7fb3e6 100644 --- a/application/Espo/Core/Utils/Language.php +++ b/application/Espo/Core/Utils/Language.php @@ -33,7 +33,6 @@ use Espo\Core\{ Exceptions\Error, Utils\Util, Utils\File\Manager as FileManager, - Utils\Metadata, Utils\Config, Utils\DataCache, Utils\Resource\Reader as ResourceReader, @@ -66,8 +65,6 @@ class Language private $fileManager; - private $metadata; - private $resourceReader; private $dataCache; @@ -75,7 +72,6 @@ class Language public function __construct( ?string $language, FileManager $fileManager, - Metadata $metadata, ResourceReader $resourceReader, DataCache $dataCache, bool $useCache = false, @@ -84,7 +80,6 @@ class Language $this->currentLanguage = $language ?? $this->defaultLanguage; $this->fileManager = $fileManager; - $this->metadata = $metadata; $this->resourceReader = $resourceReader; $this->dataCache = $dataCache; diff --git a/application/Espo/Core/Utils/TemplateFileManager.php b/application/Espo/Core/Utils/TemplateFileManager.php index d490f83499..9fd95e65df 100644 --- a/application/Espo/Core/Utils/TemplateFileManager.php +++ b/application/Espo/Core/Utils/TemplateFileManager.php @@ -40,20 +40,16 @@ class TemplateFileManager { private $config; - private $metadata; - private $fileManager; private $fileReader; public function __construct( Config $config, - Metadata $metadata, FileManager $fileManager, FileReader $fileReader ) { $this->config = $config; - $this->metadata = $metadata; $this->fileManager = $fileManager; $this->fileReader = $fileReader; } diff --git a/application/Espo/Core/WebSocket/ServerStarter.php b/application/Espo/Core/WebSocket/ServerStarter.php index 30a4c551da..eef96a581a 100644 --- a/application/Espo/Core/WebSocket/ServerStarter.php +++ b/application/Espo/Core/WebSocket/ServerStarter.php @@ -60,13 +60,10 @@ class ServerStarter private $config; - private $metadata; - public function __construct(Subscriber $subscriber, Config $config, Metadata $metadata) { $this->subscriber = $subscriber; $this->config = $config; - $this->metadata = $metadata; $this->categoriesData = $metadata->get(['app', 'webSocket', 'categories'], []); diff --git a/application/Espo/Hooks/User/ApiKey.php b/application/Espo/Hooks/User/ApiKey.php index e8aad8c378..38c97dada6 100644 --- a/application/Espo/Hooks/User/ApiKey.php +++ b/application/Espo/Hooks/User/ApiKey.php @@ -80,7 +80,7 @@ class ApiKey return; } - if ($entity->isApi() && $entity->get('authMethod') === 'Hmac') { + if ($entity->get('authMethod') === 'Hmac') { $this->apiKey->removeSecretKeyForUserId($entity->getId()); } } diff --git a/application/Espo/Modules/Crm/Classes/AclPortal/Account/OwnershipChecker.php b/application/Espo/Modules/Crm/Classes/AclPortal/Account/OwnershipChecker.php index c547e2bd99..5ce5067e0b 100644 --- a/application/Espo/Modules/Crm/Classes/AclPortal/Account/OwnershipChecker.php +++ b/application/Espo/Modules/Crm/Classes/AclPortal/Account/OwnershipChecker.php @@ -34,18 +34,11 @@ use Espo\Entities\User; use Espo\ORM\Entity; use Espo\Core\{ - Portal\Acl\DefaultOwnershipChecker, Portal\Acl\OwnershipAccountChecker, }; class OwnershipChecker implements OwnershipAccountChecker { - private $defaultOwnershipChecker; - - public function __construct(DefaultOwnershipChecker $defaultOwnershipChecker) { - $this->defaultOwnershipChecker = $defaultOwnershipChecker; - } - public function checkAccount(User $user, Entity $entity): bool { $accountIdList = $user->getLinkMultipleIdList('accounts'); diff --git a/application/Espo/Modules/Crm/Controllers/Activities.php b/application/Espo/Modules/Crm/Controllers/Activities.php index 0c42d0bb32..d45755d3d8 100644 --- a/application/Espo/Modules/Crm/Controllers/Activities.php +++ b/application/Espo/Modules/Crm/Controllers/Activities.php @@ -37,7 +37,6 @@ use Espo\Core\Exceptions\{ use Espo\Core\{ Api\Request, Acl, - Utils\Config, Record\SearchParamsFetcher, }; @@ -45,7 +44,7 @@ use Espo\Modules\Crm\Services\Activities as Service; use Espo\Entities\User; -use StdClass; +use stdClass; class Activities { @@ -55,8 +54,6 @@ class Activities private $acl; - private $config; - private $searchParamsFetcher; private $service; @@ -64,13 +61,11 @@ class Activities public function __construct( User $user, Acl $acl, - Config $config, SearchParamsFetcher $searchParamsFetcher, Service $service ) { $this->user = $user; $this->acl = $acl; - $this->config = $config; $this->searchParamsFetcher = $searchParamsFetcher; $this->service = $service; } @@ -257,7 +252,7 @@ class Activities ]); } - public function getActionEntityTypeList(Request $request): StdClass + public function getActionEntityTypeList(Request $request): stdClass { $params = $request->getRouteParams(); diff --git a/application/Espo/Modules/Crm/Services/Contact.php b/application/Espo/Modules/Crm/Services/Contact.php index e621ba7603..e7cf9f0583 100644 --- a/application/Espo/Modules/Crm/Services/Contact.php +++ b/application/Espo/Modules/Crm/Services/Contact.php @@ -66,7 +66,7 @@ class Contact extends Record ]); } else { - if ($entity->get('accountId')) { + if ($entity->get('accountId')) { /** @phpstan-ignore-line */ $email->set([ 'parentType' => 'Account', 'parentId' => $entity->get('accountId') diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php b/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php index 8650f59143..cd7f863969 100644 --- a/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php +++ b/application/Espo/Modules/Crm/Tools/MassEmail/Processor.php @@ -392,17 +392,13 @@ class Processor $target = $this->entityManager->getEntity($queueItem->get('targetType'), $queueItem->get('targetId')); - if (!$target || !$target->getId() || !$target->get('emailAddress')) { - $queueItem->set('status', 'Failed'); - - $this->entityManager->saveEntity($queueItem); - - return false; - } - $emailAddress = $target->get('emailAddress'); - if (!$emailAddress) { + if ( + !$target || + !$target->getId() || + !$emailAddress + ) { $queueItem->set('status', 'Failed'); $this->entityManager->saveEntity($queueItem);