From faa11d603e2a2ae8e58fa8a52a33774116403c39 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sun, 7 May 2023 19:18:28 +0300 Subject: [PATCH] cs --- .../Espo/Classes/AppInfo/Container.php | 19 +++------ .../FieldProcessing/Import/CountsLoader.php | 20 ++++------ .../Note/AttachmentsLoader.php | 10 ++--- .../FieldProcessing/Portal/UrlLoader.php | 13 +++---- .../FieldValidators/PersonNameType.php | 13 ++----- .../Espo/Classes/Jobs/ProcessWebhookQueue.php | 14 ++----- .../AccessControlFilters/OnlyOwn.php | 16 +++----- .../BoolFilters/OnlyMy.php | 20 ++++------ .../PortalOnlyAccount.php | 24 +++--------- .../PortalOnlyContact.php | 24 +++--------- .../Select/Email/BoolFilters/OnlyMy.php | 25 ++++-------- .../ItemConverters/EmailAddressEquals.php | 32 +++++---------- .../Email/Where/ItemConverters/FromEquals.php | 36 ++++------------- .../ItemConverters/IsImportantIsFalse.php | 30 +++++--------- .../ItemConverters/IsImportantIsTrue.php | 30 +++++--------- .../Where/ItemConverters/IsNotReadIsFalse.php | 30 +++++--------- .../Where/ItemConverters/IsNotReadIsTrue.php | 30 +++++--------- .../ItemConverters/IsNotRepliedIsFalse.php | 15 +++---- .../ItemConverters/IsNotRepliedIsTrue.php | 15 +++---- .../Email/Where/ItemConverters/ToEquals.php | 32 +++++---------- .../AccessControlFilters/Mandatory.php | 16 +++----- .../AccessControlFilters/OnlyOwn.php | 12 +++--- .../Select/EmailFilter/BoolFilters/OnlyMy.php | 26 +++++-------- .../AccessControlFilters/Mandatory.php | 32 +++++---------- .../User/AccessControlFilters/OnlyOwn.php | 22 +++-------- application/Espo/Controllers/LabelManager.php | 36 +++++++---------- application/Espo/Controllers/LastViewed.php | 17 ++------ application/Espo/Controllers/Notification.php | 17 ++++---- application/Espo/Controllers/Portal.php | 6 +-- .../Espo/Controllers/TemplateManager.php | 23 ++++------- application/Espo/Controllers/Webhook.php | 8 ++-- application/Espo/Core/Acl/Base.php | 14 +++---- .../OwnershipCheckerFactory.php | 37 +++++++----------- .../Core/Acl/Table/DefaultTableFactory.php | 26 ++++--------- application/Espo/Core/AclPortal/Base.php | 24 +++++------- .../Core/ApplicationRunners/ClearCache.php | 16 +++----- .../Espo/Core/Console/Commands/AppInfo.php | 24 ++++-------- .../Espo/Core/Console/Commands/ClearCache.php | 20 ++++------ .../Espo/Core/Console/Commands/RunJob.php | 21 +++------- .../Core/Console/Commands/UpgradeStep.php | 12 +++--- .../Espo/Core/Console/Commands/Version.php | 18 +++------ application/Espo/Core/Controllers/Base.php | 22 +++++------ .../Core/Duplicate/WhereBuilderFactory.php | 17 ++------ .../Clients/OAuth2Abstract.php | 10 ++--- .../Core/Field/Address/AddressFactory.php | 6 +-- .../Field/Address/AddressFormatterFactory.php | 24 +++--------- .../Espo/Core/Field/Date/DateFactory.php | 6 +-- .../Core/Field/DateTime/DateTimeFactory.php | 7 +--- .../DateTimeOptionalFactory.php | 7 +--- .../Espo/Core/Field/Link/LinkFactory.php | 7 +--- .../LinkMultiple/LinkMultipleFactory.php | 29 +++++--------- .../Field/LinkParent/LinkParentFactory.php | 7 +--- .../EmailAddress/AccessChecker.php | 25 ++++-------- .../FieldProcessing/EmailAddress/Loader.php | 22 +++-------- .../FieldProcessing/LinkMultiple/Loader.php | 23 +++-------- .../LinkParent/TargetLoader.php | 16 +++----- .../PhoneNumber/AccessChecker.php | 28 ++++--------- .../FieldProcessing/PhoneNumber/Loader.php | 21 +++------- .../Stream/FollowersLoader.php | 39 ++++++------------- .../VersionNumber/BeforeSaveProcessor.php | 12 ++---- .../DatetimeGroup/AddIntervalType.php | 12 ++---- application/Espo/Core/Loaders/Acl.php | 20 +++------- application/Espo/Core/Loaders/AclManager.php | 16 +++----- .../Espo/Core/Loaders/ApplicationState.php | 16 +++----- .../Espo/Core/Loaders/ApplicationUser.php | 16 +++----- .../Espo/Core/Loaders/BaseLanguage.php | 21 +++------- application/Espo/Core/Loaders/DataManager.php | 15 +++---- application/Espo/Core/Loaders/DateTime.php | 16 +++----- .../Espo/Core/Loaders/EntityManager.php | 10 ++--- application/Espo/Core/Loaders/Language.php | 28 ++++--------- application/Espo/Core/Loaders/Log.php | 16 +++----- application/Espo/Core/Loaders/Metadata.php | 21 +++------- application/Espo/Core/Loaders/NumberUtil.php | 16 +++----- application/Espo/Core/Loaders/OrmDefs.php | 18 +++------ .../Loaders/PortalAclManagerContainer.php | 14 ++----- .../Core/Notificators/DefaultNotificator.php | 8 +--- .../Core/Portal/Acl/Map/CacheKeyProvider.php | 22 +++-------- .../OwnershipCheckerFactory.php | 37 +++++++----------- .../Portal/Acl/Table/CacheKeyProvider.php | 21 +++------- .../Portal/Acl/Table/RoleListProvider.php | 34 ++++++---------- .../Core/Portal/ApplicationRunners/Client.php | 21 ++++------ .../Container/ContainerConfiguration.php | 11 ++---- application/Espo/Core/Portal/Loaders/Acl.php | 18 +++------ .../Espo/Core/Portal/Loaders/AclManager.php | 23 ++++------- .../Portal/Loaders/InternalAclManager.php | 16 +++----- .../Espo/Core/Portal/Loaders/Language.php | 36 +++++------------ application/Espo/Core/Portal/Utils/Config.php | 4 +- application/Espo/Core/Portal/Utils/Layout.php | 8 ++-- application/Espo/Core/Select/Bool/Filter.php | 6 +-- .../Core/Select/Bool/Filters/Followed.php | 26 +++++-------- .../Espo/Core/Select/SelectBuilderFactory.php | 12 ++---- .../Espo/Core/Select/SelectManager.php | 30 ++++++-------- .../Espo/Core/Select/SelectManagerFactory.php | 8 ++-- .../Espo/Core/Upgrades/Actions/Base.php | 17 ++++---- application/Espo/Hooks/Common/Webhook.php | 18 +++------ .../Hooks/Notification/WebSocketSubmit.php | 17 ++------ application/Espo/Hooks/Portal/WriteConfig.php | 19 ++------- .../Crm/Business/Reminder/EmailReminder.php | 16 +++----- .../CampaignLogRecord/OwnershipChecker.php | 28 +++++-------- .../CampaignTrackingUrl/OwnershipChecker.php | 28 +++++-------- .../Acl/MassEmail/OwnershipChecker.php | 30 +++++--------- .../AclPortal/Contact/OwnershipChecker.php | 21 ++++------ .../Call/PhoneNumberMapLoader.php | 21 ++++------ .../TargetList/OptedOutCountLoader.php | 23 +++-------- .../Meeting/Where/DateTimeItemTransformer.php | 18 ++++----- .../Espo/Modules/Crm/Entities/Account.php | 13 +++---- .../Espo/Modules/Crm/Entities/Opportunity.php | 11 +++--- .../Espo/Modules/Crm/Entities/Task.php | 10 ++--- application/Espo/Services/Import.php | 16 ++++---- application/Espo/Services/Integration.php | 16 ++++---- application/Espo/Tools/DataPrivacy/Erasor.php | 34 ++++++---------- .../FieldManager/Hooks/AutoincrementType.php | 6 +-- .../Espo/Tools/LabelManager/LabelManager.php | 17 +++----- clear_cache.php | 6 +-- public/api/v1/index.php | 6 +-- public/api/v1/portal-access/index.php | 8 ++-- .../Espo/Core/Select/SelectBuilderTest.php | 10 ++--- .../Core/Select/Bool/FilterFactoryTest.php | 20 ++++------ .../Espo/Core/Select/SelectBuilderTest.php | 38 ++++++++---------- .../Select/Where/ConverterFactoryTest.php | 26 ++++++------- .../Espo/Core/Select/Where/ScannerTest.php | 14 +++---- 121 files changed, 733 insertions(+), 1573 deletions(-) diff --git a/application/Espo/Classes/AppInfo/Container.php b/application/Espo/Classes/AppInfo/Container.php index e88fa9e070..72aa16916b 100644 --- a/application/Espo/Classes/AppInfo/Container.php +++ b/application/Espo/Classes/AppInfo/Container.php @@ -29,23 +29,14 @@ namespace Espo\Classes\AppInfo; -use Espo\Core\{ - Container as ContainerService, - Utils\Metadata, - Console\Command\Params, -}; +use Espo\Core\Console\Command\Params; +use Espo\Core\Container as ContainerService; +use Espo\Core\Utils\Metadata; class Container { - private $container; - - private $metadata; - - public function __construct(ContainerService $container, Metadata $metadata) - { - $this->container = $container; - $this->metadata = $metadata; - } + public function __construct(private ContainerService $container, private Metadata $metadata) + {} public function process(Params $params): string { diff --git a/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php b/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php index 6ffe7962e0..f4494ef480 100644 --- a/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Import/CountsLoader.php @@ -29,27 +29,21 @@ namespace Espo\Classes\FieldProcessing\Import; +use Espo\Entities\Import; use Espo\ORM\Entity; - -use Espo\Core\{ - FieldProcessing\Loader, - FieldProcessing\Loader\Params, - ORM\EntityManager, -}; +use Espo\Core\FieldProcessing\Loader; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; use Espo\Repositories\Import as ImportRepository; /** - * @implements Loader<\Espo\Entities\Import> + * @implements Loader */ class CountsLoader implements Loader { - private $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php index b702121b27..35582420ba 100644 --- a/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php +++ b/application/Espo/Classes/FieldProcessing/Note/AttachmentsLoader.php @@ -30,16 +30,12 @@ namespace Espo\Classes\FieldProcessing\Note; use Espo\ORM\Entity; - -use Espo\Core\{ - FieldProcessing\Loader, - FieldProcessing\Loader\Params, -}; - +use Espo\Core\FieldProcessing\Loader; +use Espo\Core\FieldProcessing\Loader\Params; use Espo\Entities\Note; /** - * @implements Loader<\Espo\Entities\Note> + * @implements Loader */ class AttachmentsLoader implements Loader { diff --git a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php index 2ffee5aaf9..4ad2e2aef6 100644 --- a/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php +++ b/application/Espo/Classes/FieldProcessing/Portal/UrlLoader.php @@ -33,19 +33,16 @@ use Espo\ORM\Entity; use Espo\Repositories\Portal as PortalRepository; use Espo\Entities\Portal; - -use Espo\Core\{ - FieldProcessing\Loader, - FieldProcessing\Loader\Params, - ORM\EntityManager, -}; +use Espo\Core\FieldProcessing\Loader; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; /** - * @implements Loader<\Espo\Entities\Portal> + * @implements Loader */ class UrlLoader implements Loader { - private $entityManager; + private EntityManager $entityManager; public function __construct(EntityManager $entityManager) { diff --git a/application/Espo/Classes/FieldValidators/PersonNameType.php b/application/Espo/Classes/FieldValidators/PersonNameType.php index f22eed68f2..0a13cdd73b 100644 --- a/application/Espo/Classes/FieldValidators/PersonNameType.php +++ b/application/Espo/Classes/FieldValidators/PersonNameType.php @@ -30,19 +30,12 @@ namespace Espo\Classes\FieldValidators; use Espo\ORM\Entity; - -use Espo\Core\{ - Utils\FieldUtil, -}; +use Espo\Core\Utils\FieldUtil; class PersonNameType { - private $fieldUtil; - - public function __construct(FieldUtil $fieldUtil) - { - $this->fieldUtil = $fieldUtil; - } + public function __construct(private FieldUtil $fieldUtil) + {} public function checkRequired(Entity $entity, string $field): bool { diff --git a/application/Espo/Classes/Jobs/ProcessWebhookQueue.php b/application/Espo/Classes/Jobs/ProcessWebhookQueue.php index 2960e54e14..ac63d06435 100644 --- a/application/Espo/Classes/Jobs/ProcessWebhookQueue.php +++ b/application/Espo/Classes/Jobs/ProcessWebhookQueue.php @@ -29,19 +29,13 @@ namespace Espo\Classes\Jobs; -use Espo\Core\{ - Job\JobDataLess, - Webhook\Queue, -}; +use Espo\Core\Job\JobDataLess; +use Espo\Core\Webhook\Queue; class ProcessWebhookQueue implements JobDataLess { - private $queue; - - public function __construct(Queue $queue) - { - $this->queue = $queue; - } + public function __construct(private Queue $queue) + {} public function run(): void { diff --git a/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php index 8df74a408d..6fcb272573 100644 --- a/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php +++ b/application/Espo/Classes/Select/ActionHistoryRecord/AccessControlFilters/OnlyOwn.php @@ -29,20 +29,14 @@ namespace Espo\Classes\Select\ActionHistoryRecord\AccessControlFilters; -use Espo\{ - Core\Select\AccessControl\Filter, - ORM\Query\SelectBuilder as QueryBuilder, - Entities\User, -}; +use Espo\Core\Select\AccessControl\Filter; +use Espo\Entities\User; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class OnlyOwn implements Filter { - private $user; - - public function __construct(User $user) - { - $this->user = $user; - } + public function __construct(private User $user) + {} public function apply(QueryBuilder $queryBuilder): void { diff --git a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php index 3a0b22d098..2e12e1360a 100644 --- a/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/ActionHistoryRecord/BoolFilters/OnlyMy.php @@ -29,22 +29,16 @@ namespace Espo\Classes\Select\ActionHistoryRecord\BoolFilters; -use Espo\{ - Core\Select\Bool\Filter, - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereClause, - ORM\Query\Part\Where\OrGroupBuilder, - Entities\User, -}; +use Espo\Core\Select\Bool\Filter; +use Espo\Entities\User; +use Espo\ORM\Query\Part\Where\OrGroupBuilder; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class OnlyMy implements Filter { - private $user; - - public function __construct(User $user) - { - $this->user = $user; - } + public function __construct(private User $user) + {} public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void { diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php index dfa854b496..aa3fba8ff4 100644 --- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php +++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php @@ -29,27 +29,15 @@ namespace Espo\Classes\Select\Email\AccessControlFilters; -use Espo\Core\{ - Select\AccessControl\Filter, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - Classes\Select\Email\Helpers\JoinHelper, - Entities\User, -}; +use Espo\Core\Select\AccessControl\Filter; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Entities\User; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class PortalOnlyAccount implements Filter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function apply(QueryBuilder $queryBuilder): void { diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php index a92006d0c2..72003fdd53 100644 --- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php +++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyContact.php @@ -29,27 +29,15 @@ namespace Espo\Classes\Select\Email\AccessControlFilters; -use Espo\Core\{ - Select\AccessControl\Filter, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - Classes\Select\Email\Helpers\JoinHelper, - Entities\User, -}; +use Espo\Core\Select\AccessControl\Filter; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Entities\User; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class PortalOnlyContact implements Filter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function apply(QueryBuilder $queryBuilder): void { diff --git a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php index f3cb9aca4f..5629a86607 100644 --- a/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/Email/BoolFilters/OnlyMy.php @@ -29,26 +29,17 @@ namespace Espo\Classes\Select\Email\BoolFilters; -use Espo\{ - Core\Select\Bool\Filter, - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereClause, - ORM\Query\Part\Where\OrGroupBuilder, - Classes\Select\Email\Helpers\JoinHelper, - Entities\User, -}; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Core\Select\Bool\Filter; +use Espo\Entities\User; +use Espo\ORM\Query\Part\Where\OrGroupBuilder; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class OnlyMy implements Filter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php index 00c2c44006..dbdb62f8ea 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/EmailAddressEquals.php @@ -29,32 +29,20 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, - Select\Helpers\RandomStringGenerator, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - Classes\Select\Email\Helpers\EmailAddressHelper, -}; +use Espo\Core\Select\Helpers\RandomStringGenerator; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\EmailAddressHelper; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class EmailAddressEquals implements ItemConverter { - private $emailAddressHelper; - - private $randomStringGenerator; - public function __construct( - EmailAddressHelper $emailAddressHelper, - RandomStringGenerator $randomStringGenerator - ) { - $this->emailAddressHelper = $emailAddressHelper; - $this->randomStringGenerator = $randomStringGenerator; - } + private EmailAddressHelper $emailAddressHelper, + private RandomStringGenerator $randomStringGenerator + ) {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php index 22d6a8b58d..de1b8c2fc4 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/FromEquals.php @@ -29,38 +29,18 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - ORM\EntityManager, - Classes\Select\Email\Helpers\EmailAddressHelper, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\EmailAddressHelper; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class FromEquals implements ItemConverter { - /** - * @var EntityManager - */ - protected $entityManager; - - /** - * @var EmailAddressHelper - */ - protected $emailAddressHelper; - public function __construct( - EntityManager $entityManager, - EmailAddressHelper $emailAddressHelper - ) { - $this->entityManager = $entityManager; - $this->emailAddressHelper = $emailAddressHelper; - } + private EmailAddressHelper $emailAddressHelper + ) {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php index dbdcee1d91..b7c838930d 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsFalse.php @@ -29,30 +29,18 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - Entities\User, - Classes\Select\Email\Helpers\JoinHelper, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Entities\User; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class IsImportantIsFalse implements ItemConverter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php index 1481d4dc6d..494220efac 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsImportantIsTrue.php @@ -29,30 +29,18 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - Entities\User, - Classes\Select\Email\Helpers\JoinHelper, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Entities\User; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class IsImportantIsTrue implements ItemConverter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php index 711ecdbd96..09744d3e86 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsFalse.php @@ -29,30 +29,18 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - Entities\User, - Classes\Select\Email\Helpers\JoinHelper, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Entities\User; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class IsNotReadIsFalse implements ItemConverter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php index 560f0d478a..feeea31b44 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotReadIsTrue.php @@ -29,30 +29,18 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - Entities\User, - Classes\Select\Email\Helpers\JoinHelper, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\JoinHelper; +use Espo\Entities\User; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class IsNotReadIsTrue implements ItemConverter { - private $user; - - private $joinHelper; - - public function __construct(User $user, JoinHelper $joinHelper) - { - $this->user = $user; - $this->joinHelper = $joinHelper; - } + public function __construct(private User $user, private JoinHelper $joinHelper) + {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php index 360872742c..b11be6ac7a 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsFalse.php @@ -29,16 +29,11 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class IsNotRepliedIsFalse implements ItemConverter { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php index 29a6b3a254..8a933f6cee 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/IsNotRepliedIsTrue.php @@ -29,16 +29,11 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class IsNotRepliedIsTrue implements ItemConverter { diff --git a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php index 084b0b3cdb..78d470b66c 100644 --- a/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php +++ b/application/Espo/Classes/Select/Email/Where/ItemConverters/ToEquals.php @@ -29,32 +29,20 @@ namespace Espo\Classes\Select\Email\Where\ItemConverters; -use Espo\Core\{ - Select\Where\ItemConverter, - Select\Where\Item, - Select\Helpers\RandomStringGenerator, -}; - -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereItem as WhereClauseItem, - ORM\Query\Part\WhereClause, - Classes\Select\Email\Helpers\EmailAddressHelper, -}; +use Espo\Core\Select\Helpers\RandomStringGenerator; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Classes\Select\Email\Helpers\EmailAddressHelper; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\Part\WhereItem as WhereClauseItem; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class ToEquals implements ItemConverter { - private $emailAddressHelper; - - private $randomStringGenerator; - public function __construct( - EmailAddressHelper $emailAddressHelper, - RandomStringGenerator $randomStringGenerator - ) { - $this->emailAddressHelper = $emailAddressHelper; - $this->randomStringGenerator = $randomStringGenerator; - } + private EmailAddressHelper $emailAddressHelper, + private RandomStringGenerator $randomStringGenerator + ) {} public function convert(QueryBuilder $queryBuilder, Item $item): WhereClauseItem { diff --git a/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php index 59b0571bcc..5d34a09433 100644 --- a/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php +++ b/application/Espo/Classes/Select/EmailAccount/AccessControlFilters/Mandatory.php @@ -29,20 +29,14 @@ namespace Espo\Classes\Select\EmailAccount\AccessControlFilters; -use Espo\{ - Core\Select\AccessControl\Filter, - ORM\Query\SelectBuilder as QueryBuilder, - Entities\User, -}; +use Espo\Core\Select\AccessControl\Filter; +use Espo\Entities\User; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class Mandatory implements Filter { - private $user; - - public function __construct(User $user) - { - $this->user = $user; - } + public function __construct(private User $user) + {} public function apply(QueryBuilder $queryBuilder): void { diff --git a/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php index c950873a08..944ad483af 100644 --- a/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php +++ b/application/Espo/Classes/Select/EmailFilter/AccessControlFilters/OnlyOwn.php @@ -29,13 +29,11 @@ namespace Espo\Classes\Select\EmailFilter\AccessControlFilters; -use Espo\{ - Core\Select\AccessControl\Filter, - Entities\EmailAccount, - ORM\Query\SelectBuilder as QueryBuilder, - ORM\EntityManager, - Entities\User, -}; +use Espo\Core\Select\AccessControl\Filter; +use Espo\Entities\EmailAccount; +use Espo\Entities\User; +use Espo\ORM\EntityManager; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class OnlyOwn implements Filter { diff --git a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php index 8bb3e134f6..0eaa72ee03 100644 --- a/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php +++ b/application/Espo/Classes/Select/EmailFilter/BoolFilters/OnlyMy.php @@ -29,26 +29,18 @@ namespace Espo\Classes\Select\EmailFilter\BoolFilters; -use Espo\{ - Core\Select\Bool\Filter, - Entities\EmailAccount, - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereClause, - ORM\Query\Part\Where\OrGroupBuilder, - ORM\EntityManager, - Entities\User, -}; +use Espo\Core\Select\Bool\Filter; +use Espo\Entities\EmailAccount; +use Espo\Entities\User; +use Espo\ORM\EntityManager; +use Espo\ORM\Query\Part\Where\OrGroupBuilder; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class OnlyMy implements Filter { - private User $user; - private EntityManager $entityManager; - - public function __construct(User $user, EntityManager $entityManager) - { - $this->user = $user; - $this->entityManager = $entityManager; - } + public function __construct(private User $user, private EntityManager $entityManager) + {} public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void { diff --git a/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php b/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php index 01c6d645b7..e6526b80f0 100644 --- a/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php +++ b/application/Espo/Classes/Select/Template/AccessControlFilters/Mandatory.php @@ -29,33 +29,21 @@ namespace Espo\Classes\Select\Template\AccessControlFilters; -use Espo\ORM\{ - Query\SelectBuilder, - Defs, -}; - -use Espo\Core\{ - Select\AccessControl\Filter, - AclManager, - Acl\Exceptions\NotImplemented, -}; +use Espo\ORM\Defs; +use Espo\ORM\Query\SelectBuilder; +use Espo\Core\Acl\Exceptions\NotImplemented; +use Espo\Core\AclManager; +use Espo\Core\Select\AccessControl\Filter; use Espo\Entities\User; class Mandatory implements Filter { - private $user; - - private $defs; - - private $aclManager; - - public function __construct(User $user, Defs $defs, AclManager $aclManager) - { - $this->user = $user; - $this->defs = $defs; - $this->aclManager = $aclManager; - } + public function __construct( + private User $user, + private Defs $defs, + private AclManager $aclManager + ) {} public function apply(SelectBuilder $queryBuilder): void { diff --git a/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php b/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php index 08df1dface..995eca66d5 100644 --- a/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php +++ b/application/Espo/Classes/Select/User/AccessControlFilters/OnlyOwn.php @@ -30,26 +30,16 @@ namespace Espo\Classes\Select\User\AccessControlFilters; use Espo\ORM\Query\SelectBuilder; - -use Espo\Core\{ - Select\AccessControl\Filter, - AclManager, - Acl\Table, -}; +use Espo\Core\Acl\Table; +use Espo\Core\AclManager; +use Espo\Core\Select\AccessControl\Filter; use Espo\Entities\User; class OnlyOwn implements Filter { - private $user; - - private $aclManager; - - public function __construct(User $user, AclManager $aclManager) - { - $this->user = $user; - $this->aclManager = $aclManager; - } + public function __construct(private User $user, private AclManager $aclManager) + {} public function apply(SelectBuilder $queryBuilder): void { @@ -57,7 +47,7 @@ class OnlyOwn implements Filter $queryBuilder->where([ 'OR' => [ 'id' => $this->user->getId(), - 'type' => 'portal', + 'type' => User::TYPE_PORTAL, ], ]); diff --git a/application/Espo/Controllers/LabelManager.php b/application/Espo/Controllers/LabelManager.php index 799b35fa8b..0a58e2ced9 100644 --- a/application/Espo/Controllers/LabelManager.php +++ b/application/Espo/Controllers/LabelManager.php @@ -29,34 +29,26 @@ namespace Espo\Controllers; -use Espo\Core\{ - Exceptions\Forbidden, - Exceptions\BadRequest, - Api\Request, - DataManager, -}; - -use Espo\{ - Tools\LabelManager\LabelManager as LabelManagerTool, - Entities\User, -}; +use Espo\Core\Api\Request; +use Espo\Core\DataManager; +use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Forbidden; +use Espo\Entities\User; +use Espo\Tools\LabelManager\LabelManager as LabelManagerTool; use stdClass; class LabelManager { - private $user; - - private $dataManager; - - private $labelManagerTool; - - public function __construct(User $user, DataManager $dataManager, LabelManagerTool $labelManagerTool) - { - $this->user = $user; - $this->dataManager = $dataManager; - $this->labelManagerTool = $labelManagerTool; + /** + * @throws Forbidden + */ + public function __construct( + private User $user, + private DataManager $dataManager, + private LabelManagerTool $labelManagerTool + ) { if (!$this->user->isAdmin()) { throw new Forbidden(); } diff --git a/application/Espo/Controllers/LastViewed.php b/application/Espo/Controllers/LastViewed.php index 43e2135108..0e29f2a702 100644 --- a/application/Espo/Controllers/LastViewed.php +++ b/application/Espo/Controllers/LastViewed.php @@ -29,25 +29,16 @@ namespace Espo\Controllers; -use Espo\Core\{ - Api\Request, - Record\SearchParamsFetcher, -}; - +use Espo\Core\Api\Request; +use Espo\Core\Record\SearchParamsFetcher; use Espo\Tools\ActionHistory\Service as Service; use stdClass; class LastViewed { - private SearchParamsFetcher $searchParamsFetcher; - private Service $service; - - public function __construct(SearchParamsFetcher $searchParamsFetcher, Service $service) - { - $this->searchParamsFetcher = $searchParamsFetcher; - $this->service = $service; - } + public function __construct(private SearchParamsFetcher $searchParamsFetcher, private Service $service) + {} public function getActionIndex(Request $request): stdClass { diff --git a/application/Espo/Controllers/Notification.php b/application/Espo/Controllers/Notification.php index b464ba5f1d..e5a4219e59 100644 --- a/application/Espo/Controllers/Notification.php +++ b/application/Espo/Controllers/Notification.php @@ -31,15 +31,14 @@ namespace Espo\Controllers; use Espo\Tools\Notification\RecordService as Service; -use Espo\Core\{ - Controllers\RecordBase, - Api\Request, - Api\Response, - Exceptions\BadRequest, - Exceptions\Error, - Exceptions\Forbidden, - Select\SearchParams, - Select\Where\Item as WhereItem}; +use Espo\Core\Api\Request; +use Espo\Core\Api\Response; +use Espo\Core\Controllers\RecordBase; +use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Select\SearchParams; +use Espo\Core\Select\Where\Item as WhereItem; use stdClass; diff --git a/application/Espo/Controllers/Portal.php b/application/Espo/Controllers/Portal.php index 92f9f42c69..22ab5705b8 100644 --- a/application/Espo/Controllers/Portal.php +++ b/application/Espo/Controllers/Portal.php @@ -29,10 +29,8 @@ namespace Espo\Controllers; -use Espo\Core\{ - Controllers\Record, - Acl\Table, -}; +use Espo\Core\Acl\Table; +use Espo\Core\Controllers\Record; class Portal extends Record { diff --git a/application/Espo/Controllers/TemplateManager.php b/application/Espo/Controllers/TemplateManager.php index 748f747f08..5b008ec1d1 100644 --- a/application/Espo/Controllers/TemplateManager.php +++ b/application/Espo/Controllers/TemplateManager.php @@ -31,33 +31,24 @@ namespace Espo\Controllers; use Espo\Core\Exceptions\Forbidden; use Espo\Core\Exceptions\BadRequest; - use Espo\Core\Utils\Metadata; use Espo\Core\Utils\TemplateFileManager; use Espo\Core\ApplicationState; - -use Espo\Core\{ - Api\Request, -}; +use Espo\Core\Api\Request; use stdClass; class TemplateManager { - private $metadata; - - private $templateFileManager; - - private $applicationState; + /** + * @throws Forbidden + */ public function __construct( - Metadata $metadata, - TemplateFileManager $templateFileManager, - ApplicationState $applicationState + private Metadata $metadata, + private TemplateFileManager $templateFileManager, + private ApplicationState $applicationState ) { - $this->metadata = $metadata; - $this->templateFileManager = $templateFileManager; - $this->applicationState = $applicationState; if (!$this->applicationState->isAdmin()) { throw new Forbidden(); diff --git a/application/Espo/Controllers/Webhook.php b/application/Espo/Controllers/Webhook.php index 0b99d88d06..7e881d512e 100644 --- a/application/Espo/Controllers/Webhook.php +++ b/application/Espo/Controllers/Webhook.php @@ -29,11 +29,9 @@ namespace Espo\Controllers; -use Espo\Core\{ - Controllers\RecordBase, - Api\Request, - Api\Response, -}; +use Espo\Core\Api\Request; +use Espo\Core\Api\Response; +use Espo\Core\Controllers\RecordBase; use stdClass; diff --git a/application/Espo/Core/Acl/Base.php b/application/Espo/Core/Acl/Base.php index 7b3392bf23..a7187f9f99 100644 --- a/application/Espo/Core/Acl/Base.php +++ b/application/Espo/Core/Acl/Base.php @@ -32,16 +32,12 @@ namespace Espo\Core\Acl; use Espo\Core\Interfaces\Injectable; use Espo\ORM\Entity; - use Espo\Entities\User; - -use Espo\Core\{ - ORM\EntityManager, - Acl\AccessChecker\ScopeCheckerData, - Acl\AccessChecker\ScopeChecker, - AclManager, - Utils\Config, -}; +use Espo\Core\Acl\AccessChecker\ScopeChecker; +use Espo\Core\Acl\AccessChecker\ScopeCheckerData; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Utils\Config; /** * @deprecated As of v6.0. Use AccessChecker interfaces instead. diff --git a/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php b/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php index 0378beb6ca..41aed0d15f 100644 --- a/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php +++ b/application/Espo/Core/Acl/OwnershipChecker/OwnershipCheckerFactory.php @@ -29,36 +29,25 @@ namespace Espo\Core\Acl\OwnershipChecker; -use Espo\Core\{ - Utils\Metadata, - InjectableFactory, - Acl\Exceptions\NotImplemented, - Acl\DefaultOwnershipChecker, - Acl\OwnershipChecker, - AclManager, - Binding\BindingContainer, - Binding\Binder, - Binding\BindingData, -}; +use Espo\Core\Acl\DefaultOwnershipChecker; +use Espo\Core\Acl\Exceptions\NotImplemented; +use Espo\Core\Acl\OwnershipChecker; +use Espo\Core\AclManager; +use Espo\Core\Binding\Binder; +use Espo\Core\Binding\BindingContainer; +use Espo\Core\Binding\BindingData; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Metadata; class OwnershipCheckerFactory { - /** - * @var class-string - */ + /** @var class-string */ private string $defaultClassName = DefaultOwnershipChecker::class; - private Metadata $metadata; - - private InjectableFactory $injectableFactory; - public function __construct( - Metadata $metadata, - InjectableFactory $injectableFactory - ) { - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - } + private Metadata $metadata, + private InjectableFactory $injectableFactory + ) {} /** * Create an ownership checker. diff --git a/application/Espo/Core/Acl/Table/DefaultTableFactory.php b/application/Espo/Core/Acl/Table/DefaultTableFactory.php index 4cc4f58872..141f3f6e6e 100644 --- a/application/Espo/Core/Acl/Table/DefaultTableFactory.php +++ b/application/Espo/Core/Acl/Table/DefaultTableFactory.php @@ -30,28 +30,16 @@ namespace Espo\Core\Acl\Table; use Espo\Entities\User; - -use Espo\Core\{ - InjectableFactory, - Acl\Table, - Acl\Table\DefaultTable, - Acl\Table\CacheKeyProvider, - Acl\Table\DefaultCacheKeyProvider, - Acl\Table\RoleListProvider, - Acl\Table\DefaultRoleListProvider, - Binding\BindingContainer, - Binding\Binder, - Binding\BindingData, -}; +use Espo\Core\Acl\Table; +use Espo\Core\Binding\Binder; +use Espo\Core\Binding\BindingContainer; +use Espo\Core\Binding\BindingData; +use Espo\Core\InjectableFactory; class DefaultTableFactory implements TableFactory { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} /** * Create a table. diff --git a/application/Espo/Core/AclPortal/Base.php b/application/Espo/Core/AclPortal/Base.php index 099a688c25..161f8bd226 100644 --- a/application/Espo/Core/AclPortal/Base.php +++ b/application/Espo/Core/AclPortal/Base.php @@ -30,24 +30,18 @@ namespace Espo\Core\AclPortal; use Espo\Core\Interfaces\Injectable; - use Espo\ORM\Entity; - use Espo\Entities\User; - use Espo\Core\AclManager; - -use Espo\Core\{ - ORM\EntityManager, - Portal\AclManager as PortalAclManager, - Utils\Config, - Acl\AccessChecker, - Acl\ScopeData, - Portal\Acl\Table, - Portal\Acl\AccessChecker\ScopeChecker, - Portal\Acl\AccessChecker\ScopeCheckerData, - Portal\Acl\DefaultAccessChecker, -}; +use Espo\Core\Acl\AccessChecker; +use Espo\Core\Acl\ScopeData; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Portal\Acl\AccessChecker\ScopeChecker; +use Espo\Core\Portal\Acl\AccessChecker\ScopeCheckerData; +use Espo\Core\Portal\Acl\DefaultAccessChecker; +use Espo\Core\Portal\Acl\Table; +use Espo\Core\Portal\AclManager as PortalAclManager; +use Espo\Core\Utils\Config; /** * @deprecated Use AccessChecker interfaces instead. diff --git a/application/Espo/Core/ApplicationRunners/ClearCache.php b/application/Espo/Core/ApplicationRunners/ClearCache.php index f98d3f21c7..9c65113e36 100644 --- a/application/Espo/Core/ApplicationRunners/ClearCache.php +++ b/application/Espo/Core/ApplicationRunners/ClearCache.php @@ -29,11 +29,9 @@ namespace Espo\Core\ApplicationRunners; -use Espo\Core\{ - Application\Runner, - DataManager, - Exceptions\Error, -}; +use Espo\Core\Application\Runner; +use Espo\Core\DataManager; +use Espo\Core\Exceptions\Error; /** * Clears an application cache. @@ -42,12 +40,8 @@ class ClearCache implements Runner { use Cli; - private DataManager $dataManager; - - public function __construct(DataManager $dataManager) - { - $this->dataManager = $dataManager; - } + public function __construct(private DataManager $dataManager) + {} /** * @throws Error diff --git a/application/Espo/Core/Console/Commands/AppInfo.php b/application/Espo/Core/Console/Commands/AppInfo.php index c99e2fbbcd..8417266956 100644 --- a/application/Espo/Core/Console/Commands/AppInfo.php +++ b/application/Espo/Core/Console/Commands/AppInfo.php @@ -29,27 +29,17 @@ namespace Espo\Core\Console\Commands; -use Espo\Core\{ - InjectableFactory, - Utils\File\Manager as FileManager, - Console\Command, - Console\Command\Params, - Console\IO, -}; - +use Espo\Core\Console\Command; +use Espo\Core\Console\Command\Params; +use Espo\Core\Console\IO; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\File\Manager as FileManager; use Espo\Core\Utils\Util; class AppInfo implements Command { - private InjectableFactory $injectableFactory; - - private FileManager $fileManager; - - public function __construct(InjectableFactory $injectableFactory, FileManager $fileManager) - { - $this->injectableFactory = $injectableFactory; - $this->fileManager = $fileManager; - } + public function __construct(private InjectableFactory $injectableFactory, private FileManager $fileManager) + {} public function run(Params $params, IO $io): void { diff --git a/application/Espo/Core/Console/Commands/ClearCache.php b/application/Espo/Core/Console/Commands/ClearCache.php index afc14bfd03..0f237d7145 100644 --- a/application/Espo/Core/Console/Commands/ClearCache.php +++ b/application/Espo/Core/Console/Commands/ClearCache.php @@ -29,22 +29,16 @@ namespace Espo\Core\Console\Commands; -use Espo\Core\{ - Console\Command, - Console\Command\Params, - Console\IO, - Exceptions\Error, - DataManager, -}; +use Espo\Core\Console\Command; +use Espo\Core\Console\Command\Params; +use Espo\Core\Console\IO; +use Espo\Core\DataManager; +use Espo\Core\Exceptions\Error; class ClearCache implements Command { - private DataManager $dataManager; - - public function __construct(DataManager $dataManager) - { - $this->dataManager = $dataManager; - } + public function __construct(private DataManager $dataManager) + {} /** * @throws Error diff --git a/application/Espo/Core/Console/Commands/RunJob.php b/application/Espo/Core/Console/Commands/RunJob.php index b281c50755..89a8e37d3a 100644 --- a/application/Espo/Core/Console/Commands/RunJob.php +++ b/application/Espo/Core/Console/Commands/RunJob.php @@ -29,33 +29,22 @@ namespace Espo\Core\Console\Commands; -use Espo\Core\{ - Console\Command, - Console\Command\Params, - Console\IO, -}; - +use Espo\Core\Console\Command; +use Espo\Core\Console\Command\Params; +use Espo\Core\Console\IO; use Espo\Core\Job\JobManager; use Espo\Core\Job\Job\Status; use Espo\Core\Utils\Util; - use Espo\ORM\EntityManager; - use Espo\Entities\Job; use Throwable; class RunJob implements Command { - private $jobManager; - private $entityManager; - - public function __construct(JobManager $jobManager, EntityManager $entityManager) - { - $this->jobManager = $jobManager; - $this->entityManager = $entityManager; - } + public function __construct(private JobManager $jobManager, private EntityManager $entityManager) + {} public function run(Params $params, IO $io): void { diff --git a/application/Espo/Core/Console/Commands/UpgradeStep.php b/application/Espo/Core/Console/Commands/UpgradeStep.php index 4e6b8a32ac..3ea524c489 100644 --- a/application/Espo/Core/Console/Commands/UpgradeStep.php +++ b/application/Espo/Core/Console/Commands/UpgradeStep.php @@ -29,13 +29,11 @@ namespace Espo\Core\Console\Commands; -use Espo\Core\{ - Application, - Upgrades\UpgradeManager, - Console\Command, - Console\Command\Params, - Console\IO, -}; +use Espo\Core\Application; +use Espo\Core\Console\Command; +use Espo\Core\Console\Command\Params; +use Espo\Core\Console\IO; +use Espo\Core\Upgrades\UpgradeManager; use Exception; diff --git a/application/Espo/Core/Console/Commands/Version.php b/application/Espo/Core/Console/Commands/Version.php index 2eeb2caeac..fcf88c00c1 100644 --- a/application/Espo/Core/Console/Commands/Version.php +++ b/application/Espo/Core/Console/Commands/Version.php @@ -29,21 +29,15 @@ namespace Espo\Core\Console\Commands; -use Espo\Core\{ - Utils\Config, - Console\Command, - Console\Command\Params, - Console\IO, -}; +use Espo\Core\Console\Command; +use Espo\Core\Console\Command\Params; +use Espo\Core\Console\IO; +use Espo\Core\Utils\Config; class Version implements Command { - private $config; - - public function __construct(Config $config) - { - $this->config = $config; - } + public function __construct(private Config $config) + {} public function run(Params $params, IO $io): void { diff --git a/application/Espo/Core/Controllers/Base.php b/application/Espo/Core/Controllers/Base.php index 917e0a1af2..4c7c341544 100644 --- a/application/Espo/Core/Controllers/Base.php +++ b/application/Espo/Core/Controllers/Base.php @@ -29,20 +29,16 @@ namespace Espo\Core\Controllers; -use Espo\Core\{ - Exceptions\Forbidden, - Container, - Acl, - AclManager, - Utils\Config, - Utils\Metadata, - ServiceFactory, -}; +use Espo\Core\Acl; +use Espo\Core\AclManager; +use Espo\Core\Container; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\ServiceFactory; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Metadata; -use Espo\Entities\{ - User, - Preferences, -}; +use Espo\Entities\Preferences; +use Espo\Entities\User; /** * @deprecated Don't extend. diff --git a/application/Espo/Core/Duplicate/WhereBuilderFactory.php b/application/Espo/Core/Duplicate/WhereBuilderFactory.php index 571c5ddd94..34d9cebe91 100644 --- a/application/Espo/Core/Duplicate/WhereBuilderFactory.php +++ b/application/Espo/Core/Duplicate/WhereBuilderFactory.php @@ -29,24 +29,15 @@ namespace Espo\Core\Duplicate; -use Espo\Core\{ - InjectableFactory, - Utils\Metadata, -}; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Metadata; use RuntimeException; class WhereBuilderFactory { - private $injectableFactory; - - private $metadata; - - public function __construct(InjectableFactory $injectableFactory, Metadata $metadata) - { - $this->injectableFactory = $injectableFactory; - $this->metadata = $metadata; - } + public function __construct(private InjectableFactory $injectableFactory, private Metadata $metadata) + {} public function has(string $entityType): bool { diff --git a/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php b/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php index 99300ca7e9..0ab483ac50 100644 --- a/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php +++ b/application/Espo/Core/ExternalAccount/Clients/OAuth2Abstract.php @@ -30,14 +30,10 @@ namespace Espo\Core\ExternalAccount\Clients; use Espo\Core\Exceptions\Error; - use Espo\Core\Utils\Json; - -use Espo\Core\{ - ExternalAccount\OAuth2\Client, - ExternalAccount\ClientManager, - Utils\Log, -}; +use Espo\Core\ExternalAccount\ClientManager; +use Espo\Core\ExternalAccount\OAuth2\Client; +use Espo\Core\Utils\Log; use Exception; use DateTime; diff --git a/application/Espo/Core/Field/Address/AddressFactory.php b/application/Espo/Core/Field/Address/AddressFactory.php index d40df6220a..356a6c79e5 100644 --- a/application/Espo/Core/Field/Address/AddressFactory.php +++ b/application/Espo/Core/Field/Address/AddressFactory.php @@ -29,10 +29,8 @@ namespace Espo\Core\Field\Address; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, -}; +use Espo\ORM\Entity; +use Espo\ORM\Value\ValueFactory; use Espo\Core\Field\Address; diff --git a/application/Espo/Core/Field/Address/AddressFormatterFactory.php b/application/Espo/Core/Field/Address/AddressFormatterFactory.php index adf20adff1..656cb10e55 100644 --- a/application/Espo/Core/Field/Address/AddressFormatterFactory.php +++ b/application/Espo/Core/Field/Address/AddressFormatterFactory.php @@ -31,28 +31,16 @@ namespace Espo\Core\Field\Address; use RuntimeException; -use Espo\Core\{ - InjectableFactory, - Utils\Config, -}; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Config; class AddressFormatterFactory { - private AddressFormatterMetadataProvider $metadataProvider; - - private InjectableFactory $injectableFactory; - - private Config $config; - public function __construct( - AddressFormatterMetadataProvider $metadataProvider, - InjectableFactory $injectableFactory, - Config $config - ) { - $this->metadataProvider = $metadataProvider; - $this->injectableFactory = $injectableFactory; - $this->config = $config; - } + private AddressFormatterMetadataProvider $metadataProvider, + private InjectableFactory $injectableFactory, + private Config $config + ) {} public function create(int $format): AddressFormatter { diff --git a/application/Espo/Core/Field/Date/DateFactory.php b/application/Espo/Core/Field/Date/DateFactory.php index d05cf6f5fd..5f68a9e337 100644 --- a/application/Espo/Core/Field/Date/DateFactory.php +++ b/application/Espo/Core/Field/Date/DateFactory.php @@ -29,10 +29,8 @@ namespace Espo\Core\Field\Date; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, -}; +use Espo\ORM\Entity; +use Espo\ORM\Value\ValueFactory; use Espo\Core\Field\Date; diff --git a/application/Espo/Core/Field/DateTime/DateTimeFactory.php b/application/Espo/Core/Field/DateTime/DateTimeFactory.php index 9590c7cc8e..b62c4ded05 100644 --- a/application/Espo/Core/Field/DateTime/DateTimeFactory.php +++ b/application/Espo/Core/Field/DateTime/DateTimeFactory.php @@ -29,11 +29,8 @@ namespace Espo\Core\Field\DateTime; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, -}; - +use Espo\ORM\Entity; +use Espo\ORM\Value\ValueFactory; use Espo\Core\Field\DateTime; use RuntimeException; diff --git a/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php b/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php index 1ee34e795d..0ba87da75b 100644 --- a/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php +++ b/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php @@ -29,11 +29,8 @@ namespace Espo\Core\Field\DateTimeOptional; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, -}; - +use Espo\ORM\Entity; +use Espo\ORM\Value\ValueFactory; use Espo\Core\Field\DateTimeOptional; use RuntimeException; diff --git a/application/Espo/Core/Field/Link/LinkFactory.php b/application/Espo/Core/Field/Link/LinkFactory.php index 6ea0d4cdc5..f6318235d6 100644 --- a/application/Espo/Core/Field/Link/LinkFactory.php +++ b/application/Espo/Core/Field/Link/LinkFactory.php @@ -29,11 +29,8 @@ namespace Espo\Core\Field\Link; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, -}; - +use Espo\ORM\Entity; +use Espo\ORM\Value\ValueFactory; use Espo\Core\Field\Link; use RuntimeException; diff --git a/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php b/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php index d66977ae04..1c1c221581 100644 --- a/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php +++ b/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php @@ -29,18 +29,14 @@ namespace Espo\Core\Field\LinkMultiple; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, - ORM\Defs, - ORM\EntityManager, -}; +use Espo\ORM\Defs; +use Espo\ORM\Entity; +use Espo\ORM\EntityManager; +use Espo\ORM\Value\ValueFactory; -use Espo\Core\{ - Field\LinkMultiple, - Field\LinkMultipleItem, - ORM\Entity as CoreEntity, -}; +use Espo\Core\Field\LinkMultiple; +use Espo\Core\Field\LinkMultipleItem; +use Espo\Core\ORM\Entity as CoreEntity; use RuntimeException; use InvalidArgumentException; @@ -48,15 +44,8 @@ use stdClass; class LinkMultipleFactory implements ValueFactory { - private Defs $ormDefs; - - private EntityManager $entityManager; - - public function __construct(Defs $ormDefs, EntityManager $entityManager) - { - $this->ormDefs = $ormDefs; - $this->entityManager = $entityManager; - } + public function __construct(private Defs $ormDefs, private EntityManager $entityManager) + {} public function isCreatableFromEntity(Entity $entity, string $field): bool { diff --git a/application/Espo/Core/Field/LinkParent/LinkParentFactory.php b/application/Espo/Core/Field/LinkParent/LinkParentFactory.php index 2ee63122a2..6cd2829113 100644 --- a/application/Espo/Core/Field/LinkParent/LinkParentFactory.php +++ b/application/Espo/Core/Field/LinkParent/LinkParentFactory.php @@ -29,11 +29,8 @@ namespace Espo\Core\Field\LinkParent; -use Espo\{ - ORM\Entity, - ORM\Value\ValueFactory, -}; - +use Espo\ORM\Entity; +use Espo\ORM\Value\ValueFactory; use Espo\Core\Field\LinkParent; use RuntimeException; diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/AccessChecker.php b/application/Espo/Core/FieldProcessing/EmailAddress/AccessChecker.php index 839cffc75d..131d3a3954 100644 --- a/application/Espo/Core/FieldProcessing/EmailAddress/AccessChecker.php +++ b/application/Espo/Core/FieldProcessing/EmailAddress/AccessChecker.php @@ -32,29 +32,18 @@ namespace Espo\Core\FieldProcessing\EmailAddress; use Espo\Repositories\EmailAddress as Repository; use Espo\ORM\Entity; -use Espo\Entities\{ - User, - EmailAddress, -}; +use Espo\Entities\EmailAddress; +use Espo\Entities\User; -use Espo\Core\{ - ORM\EntityManager, - AclManager, -}; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; class AccessChecker { - private $entityManager; - - private $aclManager; - public function __construct( - EntityManager $entityManager, - AclManager $aclManager - ) { - $this->entityManager = $entityManager; - $this->aclManager = $aclManager; - } + private EntityManager $entityManager, + private AclManager $aclManager + ) {} public function checkEdit(User $user, EmailAddress $emailAddress, Entity $excludeEntity): bool { diff --git a/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php b/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php index f5a340ea66..997a129545 100644 --- a/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php +++ b/application/Espo/Core/FieldProcessing/EmailAddress/Loader.php @@ -30,15 +30,10 @@ namespace Espo\Core\FieldProcessing\EmailAddress; use Espo\Repositories\EmailAddress as Repository; - use Espo\ORM\Entity; - -use Espo\Core\{ - ORM\EntityManager, - FieldProcessing\Loader as LoaderInterface, - FieldProcessing\Loader\Params, -}; - +use Espo\Core\FieldProcessing\Loader as LoaderInterface; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; use Espo\ORM\Defs as OrmDefs; /** @@ -46,15 +41,8 @@ use Espo\ORM\Defs as OrmDefs; */ class Loader implements LoaderInterface { - private OrmDefs $ormDefs; - - private EntityManager $entityManager; - - public function __construct(OrmDefs $ormDefs, EntityManager $entityManager) - { - $this->ormDefs = $ormDefs; - $this->entityManager = $entityManager; - } + public function __construct(private OrmDefs $ormDefs, private EntityManager $entityManager) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php index 2bba8655e2..a95d46c2ae 100644 --- a/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php +++ b/application/Espo/Core/FieldProcessing/LinkMultiple/Loader.php @@ -30,14 +30,9 @@ namespace Espo\Core\FieldProcessing\LinkMultiple; use Espo\ORM\Entity; - use Espo\Core\ORM\Entity as CoreEntity; - -use Espo\Core\{ - FieldProcessing\Loader as LoaderInterface, - FieldProcessing\Loader\Params, -}; - +use Espo\Core\FieldProcessing\Loader as LoaderInterface; +use Espo\Core\FieldProcessing\Loader\Params; use Espo\ORM\Defs as OrmDefs; /** @@ -45,17 +40,11 @@ use Espo\ORM\Defs as OrmDefs; */ class Loader implements LoaderInterface { - private OrmDefs $ormDefs; + /** @var array */ + private array $fieldListCacheMap = []; - /** - * @var array - */ - private $fieldListCacheMap = []; - - public function __construct(OrmDefs $ormDefs) - { - $this->ormDefs = $ormDefs; - } + public function __construct(private OrmDefs $ormDefs) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php b/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php index 9fdcca0624..2c6e9cace3 100644 --- a/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php +++ b/application/Espo/Core/FieldProcessing/LinkParent/TargetLoader.php @@ -31,23 +31,17 @@ namespace Espo\Core\FieldProcessing\LinkParent; use Espo\ORM\Entity; -use Espo\Core\{ - ORM\EntityManager, - FieldProcessing\Loader as LoaderInterface, - FieldProcessing\Loader\Params, -}; +use Espo\Core\FieldProcessing\Loader as LoaderInterface; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; /** * @implements LoaderInterface */ class TargetLoader implements LoaderInterface { - private EntityManager $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/AccessChecker.php b/application/Espo/Core/FieldProcessing/PhoneNumber/AccessChecker.php index 56b9939b5a..495dbdff10 100644 --- a/application/Espo/Core/FieldProcessing/PhoneNumber/AccessChecker.php +++ b/application/Espo/Core/FieldProcessing/PhoneNumber/AccessChecker.php @@ -30,32 +30,18 @@ namespace Espo\Core\FieldProcessing\PhoneNumber; use Espo\Repositories\PhoneNumber as Repository; - use Espo\ORM\Entity; - -use Espo\Entities\{ - User, - PhoneNumber, -}; - -use Espo\Core\{ - ORM\EntityManager, - AclManager, -}; +use Espo\Entities\PhoneNumber; +use Espo\Entities\User; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; class AccessChecker { - private $entityManager; - - private $aclManager; - public function __construct( - EntityManager $entityManager, - AclManager $aclManager - ) { - $this->entityManager = $entityManager; - $this->aclManager = $aclManager; - } + private EntityManager $entityManager, + private AclManager $aclManager + ) {} public function checkEdit(User $user, PhoneNumber $phoneNumber, Entity $excludeEntity): bool { diff --git a/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php b/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php index 7589b8f8c2..12b9edd5ea 100644 --- a/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php +++ b/application/Espo/Core/FieldProcessing/PhoneNumber/Loader.php @@ -30,14 +30,10 @@ namespace Espo\Core\FieldProcessing\PhoneNumber; use Espo\ORM\Entity; - use Espo\Repositories\PhoneNumber as Repository; - -use Espo\Core\{ - ORM\EntityManager, - FieldProcessing\Loader as LoaderInterface, - FieldProcessing\Loader\Params, -}; +use Espo\Core\FieldProcessing\Loader as LoaderInterface; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; use Espo\ORM\Defs as OrmDefs; @@ -46,15 +42,8 @@ use Espo\ORM\Defs as OrmDefs; */ class Loader implements LoaderInterface { - private OrmDefs $ormDefs; - - private EntityManager $entityManager; - - public function __construct(OrmDefs $ormDefs, EntityManager $entityManager) - { - $this->ormDefs = $ormDefs; - $this->entityManager = $entityManager; - } + public function __construct(private OrmDefs $ormDefs, private EntityManager $entityManager) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php b/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php index 05c7fe7a4b..baf95e1695 100644 --- a/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php +++ b/application/Espo/Core/FieldProcessing/Stream/FollowersLoader.php @@ -30,17 +30,12 @@ namespace Espo\Core\FieldProcessing\Stream; use Espo\ORM\Entity; - -use Espo\Core\{ - FieldProcessing\Loader as LoaderInterface, - FieldProcessing\Loader\Params, - Utils\Metadata, - Utils\Config, - Acl, -}; - +use Espo\Core\Acl; +use Espo\Core\FieldProcessing\Loader as LoaderInterface; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Metadata; use Espo\Entities\User; - use Espo\Tools\Stream\Service as StreamService; /** @@ -50,25 +45,13 @@ class FollowersLoader implements LoaderInterface { private const FOLLOWERS_LIMIT = 6; - private StreamService $streamService; - private Metadata $metadata; - private User $user; - private Acl $acl; - private Config $config; - public function __construct( - StreamService $streamService, - Metadata $metadata, - User $user, - Acl $acl, - Config $config - ) { - $this->streamService = $streamService; - $this->metadata = $metadata; - $this->user = $user; - $this->acl = $acl; - $this->config = $config; - } + private StreamService $streamService, + private Metadata $metadata, + private User $user, + private Acl $acl, + private Config $config + ) {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php b/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php index b7d3fae5b8..a2cff64392 100644 --- a/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php +++ b/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php @@ -29,20 +29,14 @@ namespace Espo\Core\FieldProcessing\VersionNumber; -use Espo\Core\{ - Utils\Metadata, -}; - +use Espo\Core\Utils\Metadata; use Espo\ORM\Entity; class BeforeSaveProcessor { - private $metadata; - public function __construct(Metadata $metadata) - { - $this->metadata = $metadata; - } + public function __construct(private Metadata $metadata) + {} public function process(Entity $entity): void { diff --git a/application/Espo/Core/Formula/Functions/DatetimeGroup/AddIntervalType.php b/application/Espo/Core/Formula/Functions/DatetimeGroup/AddIntervalType.php index 6caae4c931..fa3ebd78b6 100644 --- a/application/Espo/Core/Formula/Functions/DatetimeGroup/AddIntervalType.php +++ b/application/Espo/Core/Formula/Functions/DatetimeGroup/AddIntervalType.php @@ -29,15 +29,11 @@ namespace Espo\Core\Formula\Functions\DatetimeGroup; -use Espo\Core\{ - Di, - Utils\DateTime as DateTimeUtil, -}; +use Espo\Core\Di; +use Espo\Core\Utils\DateTime as DateTimeUtil; -use Espo\Core\Formula\{ - Functions\BaseFunction, - ArgumentList, -}; +use Espo\Core\Formula\ArgumentList; +use Espo\Core\Formula\Functions\BaseFunction; use DateTime; use Exception; diff --git a/application/Espo/Core/Loaders/Acl.php b/application/Espo/Core/Loaders/Acl.php index 57899967af..5730c12258 100644 --- a/application/Espo/Core/Loaders/Acl.php +++ b/application/Espo/Core/Loaders/Acl.php @@ -29,25 +29,15 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - AclManager, - Acl as AclService, -}; - +use Espo\Core\Acl as AclService; +use Espo\Core\AclManager; +use Espo\Core\Container\Loader; use Espo\Entities\User; class Acl implements Loader { - private $aclManager; - - private $user; - - public function __construct(AclManager $aclManager, User $user) - { - $this->aclManager = $aclManager; - $this->user = $user; - } + public function __construct(private AclManager $aclManager, private User $user) + {} public function load(): AclService { diff --git a/application/Espo/Core/Loaders/AclManager.php b/application/Espo/Core/Loaders/AclManager.php index d7e9d78de3..11ee5ca903 100644 --- a/application/Espo/Core/Loaders/AclManager.php +++ b/application/Espo/Core/Loaders/AclManager.php @@ -29,20 +29,14 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - InjectableFactory, - AclManager as AclManagerService, -}; +use Espo\Core\AclManager as AclManagerService; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; class AclManager implements Loader { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function load(): AclManagerService { diff --git a/application/Espo/Core/Loaders/ApplicationState.php b/application/Espo/Core/Loaders/ApplicationState.php index f329d46c58..4ffd11e06a 100644 --- a/application/Espo/Core/Loaders/ApplicationState.php +++ b/application/Espo/Core/Loaders/ApplicationState.php @@ -29,20 +29,14 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Container, - ApplicationState as ApplicationStateService, -}; +use Espo\Core\ApplicationState as ApplicationStateService; +use Espo\Core\Container; +use Espo\Core\Container\Loader; class ApplicationState implements Loader { - private $container; - - public function __construct(Container $container) - { - $this->container = $container; - } + public function __construct(private Container $container) + {} public function load(): ApplicationStateService { diff --git a/application/Espo/Core/Loaders/ApplicationUser.php b/application/Espo/Core/Loaders/ApplicationUser.php index 840353ea99..c940dcd65f 100644 --- a/application/Espo/Core/Loaders/ApplicationUser.php +++ b/application/Espo/Core/Loaders/ApplicationUser.php @@ -29,20 +29,14 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - InjectableFactory, - ApplicationUser as Service, -}; +use Espo\Core\ApplicationUser as Service; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; class ApplicationUser implements Loader { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function load(): Service { diff --git a/application/Espo/Core/Loaders/BaseLanguage.php b/application/Espo/Core/Loaders/BaseLanguage.php index 85b1fbd7a0..d2cda9fe9d 100644 --- a/application/Espo/Core/Loaders/BaseLanguage.php +++ b/application/Espo/Core/Loaders/BaseLanguage.php @@ -29,24 +29,15 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Utils\Config, - Utils\Language as LanguageService, - InjectableFactory, -}; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Language as LanguageService; class BaseLanguage implements Loader { - private InjectableFactory $injectableFactory; - - protected Config $config; - - public function __construct(InjectableFactory $injectableFactory, Config $config) - { - $this->injectableFactory = $injectableFactory; - $this->config = $config; - } + public function __construct(private InjectableFactory $injectableFactory, protected Config $config) + {} public function load(): LanguageService { diff --git a/application/Espo/Core/Loaders/DataManager.php b/application/Espo/Core/Loaders/DataManager.php index eea28fbfa0..2d6cd68d85 100644 --- a/application/Espo/Core/Loaders/DataManager.php +++ b/application/Espo/Core/Loaders/DataManager.php @@ -29,20 +29,15 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - InjectableFactory, - DataManager as DataManagerService, -}; +use Espo\Core\Container\Loader; +use Espo\Core\DataManager as DataManagerService; +use Espo\Core\InjectableFactory; class DataManager implements Loader { - private InjectableFactory $injectableFactory; - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function load(): DataManagerService { diff --git a/application/Espo/Core/Loaders/DateTime.php b/application/Espo/Core/Loaders/DateTime.php index 1590aad3b4..11e7760aee 100644 --- a/application/Espo/Core/Loaders/DateTime.php +++ b/application/Espo/Core/Loaders/DateTime.php @@ -29,20 +29,14 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Utils\Config, - Utils\DateTime as DateTimeService, -}; +use Espo\Core\Container\Loader; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\DateTime as DateTimeService; class DateTime implements Loader { - private Config $config; - - public function __construct(Config $config) - { - $this->config = $config; - } + public function __construct(private Config $config) + {} public function load(): DateTimeService { diff --git a/application/Espo/Core/Loaders/EntityManager.php b/application/Espo/Core/Loaders/EntityManager.php index 7cb2c73b36..1693839092 100644 --- a/application/Espo/Core/Loaders/EntityManager.php +++ b/application/Espo/Core/Loaders/EntityManager.php @@ -29,15 +29,13 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - ORM\EntityManagerFactory, - ORM\EntityManager as EntityManagerService, -}; +use Espo\Core\Container\Loader; +use Espo\Core\ORM\EntityManager as EntityManagerService; +use Espo\Core\ORM\EntityManagerFactory; class EntityManager implements Loader { - private $entityManagerFactory; + private EntityManagerFactory $entityManagerFactory; public function __construct(EntityManagerFactory $entityManagerFactory) { diff --git a/application/Espo/Core/Loaders/Language.php b/application/Espo/Core/Loaders/Language.php index 15ea5e9b6d..c9b4e1f4ae 100644 --- a/application/Espo/Core/Loaders/Language.php +++ b/application/Espo/Core/Loaders/Language.php @@ -29,32 +29,20 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Utils\Config, - Utils\Language as LanguageService, - InjectableFactory, -}; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Language as LanguageService; use Espo\Entities\Preferences; class Language implements Loader { - private $injectableFactory; - - private $config; - - private $preferences; - public function __construct( - InjectableFactory $injectableFactory, - Config $config, - Preferences $preferences - ) { - $this->injectableFactory = $injectableFactory; - $this->config = $config; - $this->preferences = $preferences; - } + private InjectableFactory $injectableFactory, + private Config $config, + private Preferences $preferences + ) {} public function load(): LanguageService { diff --git a/application/Espo/Core/Loaders/Log.php b/application/Espo/Core/Loaders/Log.php index e0bd7bcc39..5097086a79 100644 --- a/application/Espo/Core/Loaders/Log.php +++ b/application/Espo/Core/Loaders/Log.php @@ -29,20 +29,14 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Log\LogLoader, - Utils\Log as LogService, -}; +use Espo\Core\Container\Loader; +use Espo\Core\Log\LogLoader; +use Espo\Core\Utils\Log as LogService; class Log implements Loader { - private $logLoader; - - public function __construct(LogLoader $logLoader) - { - $this->logLoader = $logLoader; - } + public function __construct(private LogLoader $logLoader) + {} public function load(): LogService { diff --git a/application/Espo/Core/Loaders/Metadata.php b/application/Espo/Core/Loaders/Metadata.php index 5b72564229..3ed74eaff7 100644 --- a/application/Espo/Core/Loaders/Metadata.php +++ b/application/Espo/Core/Loaders/Metadata.php @@ -29,24 +29,15 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Utils\Metadata as MetadataService, - Utils\Config, - InjectableFactory, -}; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Metadata as MetadataService; class Metadata implements Loader { - private $injectableFactory; - - private $config; - - public function __construct(InjectableFactory $injectableFactory, Config $config) - { - $this->injectableFactory = $injectableFactory; - $this->config = $config; - } + public function __construct(private InjectableFactory $injectableFactory, private Config $config) + {} public function load(): MetadataService { diff --git a/application/Espo/Core/Loaders/NumberUtil.php b/application/Espo/Core/Loaders/NumberUtil.php index 0bbac7ce05..1975c6d0d3 100644 --- a/application/Espo/Core/Loaders/NumberUtil.php +++ b/application/Espo/Core/Loaders/NumberUtil.php @@ -29,20 +29,14 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - Utils\Config, - Utils\NumberUtil as NumberUtilService, -}; +use Espo\Core\Container\Loader; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\NumberUtil as NumberUtilService; class NumberUtil implements Loader { - private $config; - - public function __construct(Config $config) - { - $this->config = $config; - } + public function __construct(private Config $config) + {} public function load(): NumberUtilService { diff --git a/application/Espo/Core/Loaders/OrmDefs.php b/application/Espo/Core/Loaders/OrmDefs.php index 79aea0e646..355ae8633a 100644 --- a/application/Espo/Core/Loaders/OrmDefs.php +++ b/application/Espo/Core/Loaders/OrmDefs.php @@ -29,23 +29,15 @@ namespace Espo\Core\Loaders; -use Espo\{ - Core\Container\Loader, -}; - -use Espo\{ - ORM\Defs, - ORM\EntityManager, -}; +use Espo\Core\Container\Loader; +use Espo\ORM\Defs; +use Espo\ORM\EntityManager; class OrmDefs implements Loader { - private $entityManager; - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} public function load(): Defs { diff --git a/application/Espo/Core/Loaders/PortalAclManagerContainer.php b/application/Espo/Core/Loaders/PortalAclManagerContainer.php index cd0ee68fa8..94746c61c6 100644 --- a/application/Espo/Core/Loaders/PortalAclManagerContainer.php +++ b/application/Espo/Core/Loaders/PortalAclManagerContainer.php @@ -29,19 +29,13 @@ namespace Espo\Core\Loaders; -use Espo\Core\{ - Container\Loader, - InjectableFactory, - Portal\AclManagerContainer as PortalAclManagerContainerService -}; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; +use Espo\Core\Portal\AclManagerContainer as PortalAclManagerContainerService; class PortalAclManagerContainer implements Loader { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) {} public function load(): PortalAclManagerContainerService { diff --git a/application/Espo/Core/Notificators/DefaultNotificator.php b/application/Espo/Core/Notificators/DefaultNotificator.php index 49f22823fc..4c4d126747 100644 --- a/application/Espo/Core/Notificators/DefaultNotificator.php +++ b/application/Espo/Core/Notificators/DefaultNotificator.php @@ -30,15 +30,11 @@ namespace Espo\Core\Notificators; use Espo\ORM\Entity; - use Espo\Entities\User; - use Espo\Core\Notification\AssignmentNotificator\Params; -use Espo\Core\{ - ORM\EntityManager, - Notification\DefaultAssignmentNotificator -}; +use Espo\Core\Notification\DefaultAssignmentNotificator; +use Espo\Core\ORM\EntityManager; /** * @deprecated As of v7.0. Use plain classes that implement `Espo\Core\Notification\AssignmentNotificator`. diff --git a/application/Espo/Core/Portal/Acl/Map/CacheKeyProvider.php b/application/Espo/Core/Portal/Acl/Map/CacheKeyProvider.php index 2ff369f895..3525f63ffc 100644 --- a/application/Espo/Core/Portal/Acl/Map/CacheKeyProvider.php +++ b/application/Espo/Core/Portal/Acl/Map/CacheKeyProvider.php @@ -29,26 +29,14 @@ namespace Espo\Core\Portal\Acl\Map; -use Espo\Entities\{ - User, - Portal, -}; - -use Espo\Core\{ - Acl\Map\CacheKeyProvider as CacheKeyProviderInterface, -}; +use Espo\Entities\Portal; +use Espo\Entities\User; +use Espo\Core\Acl\Map\CacheKeyProvider as CacheKeyProviderInterface; class CacheKeyProvider implements CacheKeyProviderInterface { - private $user; - - private $portal; - - public function __construct(User $user, Portal $portal) - { - $this->user = $user; - $this->portal = $portal; - } + public function __construct(private User $user, private Portal $portal) + {} public function get(): string { diff --git a/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php b/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php index f68a1e370d..1e47938d45 100644 --- a/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php +++ b/application/Espo/Core/Portal/Acl/OwnershipChecker/OwnershipCheckerFactory.php @@ -29,36 +29,25 @@ namespace Espo\Core\Portal\Acl\OwnershipChecker; -use Espo\Core\{ - Utils\Metadata, - InjectableFactory, - Acl\Exceptions\NotImplemented, - Acl\OwnershipChecker, - Portal\AclManager as PortalAclManager, - Portal\Acl\DefaultOwnershipChecker, - Binding\BindingContainer, - Binding\Binder, - Binding\BindingData, -}; +use Espo\Core\Acl\Exceptions\NotImplemented; +use Espo\Core\Acl\OwnershipChecker; +use Espo\Core\Binding\Binder; +use Espo\Core\Binding\BindingContainer; +use Espo\Core\Binding\BindingData; +use Espo\Core\InjectableFactory; +use Espo\Core\Portal\Acl\DefaultOwnershipChecker; +use Espo\Core\Portal\AclManager as PortalAclManager; +use Espo\Core\Utils\Metadata; class OwnershipCheckerFactory { - /** - * @var class-string - */ + /** @var class-string */ private $defaultClassName = DefaultOwnershipChecker::class; - private Metadata $metadata; - - private InjectableFactory $injectableFactory; - public function __construct( - Metadata $metadata, - InjectableFactory $injectableFactory - ) { - $this->metadata = $metadata; - $this->injectableFactory = $injectableFactory; - } + private Metadata $metadata, + private InjectableFactory $injectableFactory + ) {} /** * Create an ownership checker. diff --git a/application/Espo/Core/Portal/Acl/Table/CacheKeyProvider.php b/application/Espo/Core/Portal/Acl/Table/CacheKeyProvider.php index 819004ceaf..fd11f7a3e9 100644 --- a/application/Espo/Core/Portal/Acl/Table/CacheKeyProvider.php +++ b/application/Espo/Core/Portal/Acl/Table/CacheKeyProvider.php @@ -29,26 +29,15 @@ namespace Espo\Core\Portal\Acl\Table; -use Espo\Entities\{ - User, - Portal, -}; +use Espo\Entities\Portal; +use Espo\Entities\User; -use Espo\Core\{ - Acl\Table\CacheKeyProvider as CacheKeyProviderInterface, -}; +use Espo\Core\Acl\Table\CacheKeyProvider as CacheKeyProviderInterface; class CacheKeyProvider implements CacheKeyProviderInterface { - private $user; - - private $portal; - - public function __construct(User $user, Portal $portal) - { - $this->user = $user; - $this->portal = $portal; - } + public function __construct(private User $user, private Portal $portal) + {} public function get(): string { diff --git a/application/Espo/Core/Portal/Acl/Table/RoleListProvider.php b/application/Espo/Core/Portal/Acl/Table/RoleListProvider.php index fc25d2318a..5d8784659e 100644 --- a/application/Espo/Core/Portal/Acl/Table/RoleListProvider.php +++ b/application/Espo/Core/Portal/Acl/Table/RoleListProvider.php @@ -31,32 +31,20 @@ namespace Espo\Core\Portal\Acl\Table; use Espo\ORM\EntityManager; -use Espo\Entities\{ - User, - Portal, - PortalRole, -}; - -use Espo\Core\{ - Acl\Table\RoleListProvider as RoleListProviderInterface, - Acl\Table\RoleEntityWrapper, - Acl\Table\Role, -}; +use Espo\Entities\Portal; +use Espo\Entities\PortalRole; +use Espo\Entities\User; +use Espo\Core\Acl\Table\Role; +use Espo\Core\Acl\Table\RoleEntityWrapper; +use Espo\Core\Acl\Table\RoleListProvider as RoleListProviderInterface; class RoleListProvider implements RoleListProviderInterface { - private $user; - - private $portal; - - private $entityManager; - - public function __construct(User $user, Portal $portal, EntityManager $entityManager) - { - $this->user = $user; - $this->portal = $portal; - $this->entityManager = $entityManager; - } + public function __construct( + private User $user, + private Portal $portal, + private EntityManager $entityManager + ) {} /** * @return Role[] diff --git a/application/Espo/Core/Portal/ApplicationRunners/Client.php b/application/Espo/Core/Portal/ApplicationRunners/Client.php index 02b6c64196..8f6bc5ab2b 100644 --- a/application/Espo/Core/Portal/ApplicationRunners/Client.php +++ b/application/Espo/Core/Portal/ApplicationRunners/Client.php @@ -29,26 +29,19 @@ namespace Espo\Core\Portal\ApplicationRunners; -use Espo\Core\{ - Application\Runner, - Utils\ClientManager, - ApplicationState, -}; +use Espo\Core\Application\Runner; +use Espo\Core\ApplicationState; +use Espo\Core\Utils\ClientManager; /** * Displays the main HTML page for a portal. */ class Client implements Runner { - private $clientManager; - - private $applicationState; - - public function __construct(ClientManager $clientManager, ApplicationState $applicationState) - { - $this->clientManager = $clientManager; - $this->applicationState = $applicationState; - } + public function __construct( + private ClientManager $clientManager, + private ApplicationState $applicationState + ) {} public function run(): void { diff --git a/application/Espo/Core/Portal/Container/ContainerConfiguration.php b/application/Espo/Core/Portal/Container/ContainerConfiguration.php index a8bfdc9849..2b816fa767 100644 --- a/application/Espo/Core/Portal/Container/ContainerConfiguration.php +++ b/application/Espo/Core/Portal/Container/ContainerConfiguration.php @@ -29,9 +29,7 @@ namespace Espo\Core\Portal\Container; -use Espo\Core\{ - Container\ContainerConfiguration as BaseContainerConfiguration, -}; +use Espo\Core\Container\ContainerConfiguration as BaseContainerConfiguration; class ContainerConfiguration extends BaseContainerConfiguration { @@ -45,7 +43,7 @@ class ContainerConfiguration extends BaseContainerConfiguration try { $className = $this->metadata->get(['app', 'portalContainerServices', $name, 'loaderClassName']); } - catch (\Exception $e) {} + catch (\Exception) {} if ($className && class_exists($className)) { return $className; @@ -68,11 +66,8 @@ class ContainerConfiguration extends BaseContainerConfiguration */ public function getServiceClassName(string $name): ?string { - $className = - $this->metadata->get(['app', 'portalContainerServices', $name, 'className']) ?? + return $this->metadata->get(['app', 'portalContainerServices', $name, 'className']) ?? parent::getServiceClassName($name); - - return $className; } /** diff --git a/application/Espo/Core/Portal/Loaders/Acl.php b/application/Espo/Core/Portal/Loaders/Acl.php index 994a273489..2b76749da6 100644 --- a/application/Espo/Core/Portal/Loaders/Acl.php +++ b/application/Espo/Core/Portal/Loaders/Acl.php @@ -30,23 +30,17 @@ namespace Espo\Core\Portal\Loaders; use Espo\Core\Portal\AclManager as PortalAclManager; +use Espo\Core\AclManager; +use Espo\Core\Container\Loader; +use Espo\Core\Portal\Acl as AclService; +use Espo\Entities\User; use InvalidArgumentException; -use Espo\Core\{ - Container\Loader, - AclManager, - Portal\Acl as AclService, -}; - -use Espo\Entities\User; - class Acl implements Loader { - /** @var PortalAclManager */ - private $aclManager; - - private $user; + private PortalAclManager $aclManager; + private User $user; public function __construct(AclManager $aclManager, User $user) { diff --git a/application/Espo/Core/Portal/Loaders/AclManager.php b/application/Espo/Core/Portal/Loaders/AclManager.php index a48a87186c..8f7fe5c8bf 100644 --- a/application/Espo/Core/Portal/Loaders/AclManager.php +++ b/application/Espo/Core/Portal/Loaders/AclManager.php @@ -29,24 +29,17 @@ namespace Espo\Core\Portal\Loaders; -use Espo\Core\{ - Container\Loader, - InjectableFactory, - AclManager as InternalAclManager, - Portal\AclManager as PortalAclManager, -}; +use Espo\Core\AclManager as InternalAclManager; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; +use Espo\Core\Portal\AclManager as PortalAclManager; class AclManager implements Loader { - private $injectableFactory; - - private $internalAclManager; - - public function __construct(InjectableFactory $injectableFactory, InternalAclManager $internalAclManager) - { - $this->injectableFactory = $injectableFactory; - $this->internalAclManager = $internalAclManager; - } + public function __construct( + private InjectableFactory $injectableFactory, + private InternalAclManager $internalAclManager + ) {} public function load(): PortalAclManager { diff --git a/application/Espo/Core/Portal/Loaders/InternalAclManager.php b/application/Espo/Core/Portal/Loaders/InternalAclManager.php index 863e2ee2a3..27edcfd3ca 100644 --- a/application/Espo/Core/Portal/Loaders/InternalAclManager.php +++ b/application/Espo/Core/Portal/Loaders/InternalAclManager.php @@ -29,20 +29,14 @@ namespace Espo\Core\Portal\Loaders; -use Espo\Core\{ - Container\Loader, - InjectableFactory, - AclManager as InternalAclManagerService, -}; +use Espo\Core\AclManager as InternalAclManagerService; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; class InternalAclManager implements Loader { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function load(): InternalAclManagerService { diff --git a/application/Espo/Core/Portal/Loaders/Language.php b/application/Espo/Core/Portal/Loaders/Language.php index 2bfb041287..df27164aaf 100644 --- a/application/Espo/Core/Portal/Loaders/Language.php +++ b/application/Espo/Core/Portal/Loaders/Language.php @@ -29,42 +29,26 @@ namespace Espo\Core\Portal\Loaders; -use Espo\Core\{ - Container\Loader, - Utils\Config, - Portal\Utils\Language as LanguageService, - InjectableFactory, -}; +use Espo\Core\Container\Loader; +use Espo\Core\InjectableFactory; +use Espo\Core\Portal\Utils\Language as LanguageService; +use Espo\Core\Utils\Config; -use Espo\Entities\{ - Preferences, -}; +use Espo\Entities\Preferences; class Language implements Loader { - private $injectableFactory; - - private $config; - - private $preferences; - public function __construct( - InjectableFactory $injectableFactory, - Config $config, - Preferences $preferences - ) { - $this->injectableFactory = $injectableFactory; - $this->config = $config; - $this->preferences = $preferences; - } + private InjectableFactory $injectableFactory, + private Config $config, + private Preferences $preferences + ) {} public function load(): LanguageService { - $language = $this->injectableFactory->createWith(LanguageService::class, [ + return $this->injectableFactory->createWith(LanguageService::class, [ 'language' => LanguageService::detectLanguage($this->config, $this->preferences), 'useCache' => $this->config->get('useCache') ?? false, ]); - - return $language; } } diff --git a/application/Espo/Core/Portal/Utils/Config.php b/application/Espo/Core/Portal/Utils/Config.php index a4d34ea5d8..59bcf74c8b 100644 --- a/application/Espo/Core/Portal/Utils/Config.php +++ b/application/Espo/Core/Portal/Utils/Config.php @@ -29,9 +29,7 @@ namespace Espo\Core\Portal\Utils; -use Espo\Core\{ - Utils\Config as BaseConfig, -}; +use Espo\Core\Utils\Config as BaseConfig; use RuntimeException; use stdClass; diff --git a/application/Espo/Core/Portal/Utils/Layout.php b/application/Espo/Core/Portal/Utils/Layout.php index c9101a8670..2de536cf16 100644 --- a/application/Espo/Core/Portal/Utils/Layout.php +++ b/application/Espo/Core/Portal/Utils/Layout.php @@ -29,11 +29,9 @@ namespace Espo\Core\Portal\Utils; -use Espo\Core\{ - Utils\Layout as LayoutBase, - Exceptions\Error, - Utils\Resource\FileReader\Params as FileReaderParams, -}; +use Espo\Core\Exceptions\Error; +use Espo\Core\Utils\Layout as LayoutBase; +use Espo\Core\Utils\Resource\FileReader\Params as FileReaderParams; class Layout extends LayoutBase { diff --git a/application/Espo/Core/Select/Bool/Filter.php b/application/Espo/Core/Select/Bool/Filter.php index 040f926384..b533ba64e9 100644 --- a/application/Espo/Core/Select/Bool/Filter.php +++ b/application/Espo/Core/Select/Bool/Filter.php @@ -29,10 +29,8 @@ namespace Espo\Core\Select\Bool; -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\Where\OrGroupBuilder, -}; +use Espo\ORM\Query\Part\Where\OrGroupBuilder; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; /** * Applies a bool filter. A where item should be added to OrGroupBuilder. diff --git a/application/Espo/Core/Select/Bool/Filters/Followed.php b/application/Espo/Core/Select/Bool/Filters/Followed.php index c14999c697..8dd5bc6e31 100644 --- a/application/Espo/Core/Select/Bool/Filters/Followed.php +++ b/application/Espo/Core/Select/Bool/Filters/Followed.php @@ -29,32 +29,24 @@ namespace Espo\Core\Select\Bool\Filters; -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - ORM\Query\Part\WhereClause, - ORM\Query\Part\Where\OrGroupBuilder, - Core\Select\Bool\Filter, - Entities\User, -}; +use Espo\Core\Select\Bool\Filter; +use Espo\Entities\Subscription; +use Espo\Entities\User; +use Espo\ORM\Query\Part\Where\OrGroupBuilder; +use Espo\ORM\Query\Part\WhereClause; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class Followed implements Filter { - private $entityType; - - private $user; - - public function __construct(string $entityType, User $user) - { - $this->entityType = $entityType; - $this->user = $user; - } + public function __construct(private string $entityType, private User $user) + {} public function apply(QueryBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void { $alias = 'subscriptionFollowedBoolFilter'; $queryBuilder->leftJoin( - 'Subscription', + Subscription::ENTITY_TYPE, $alias, [ $alias . '.entityType' => $this->entityType, diff --git a/application/Espo/Core/Select/SelectBuilderFactory.php b/application/Espo/Core/Select/SelectBuilderFactory.php index 95ee44ae91..df8cc0d8a7 100644 --- a/application/Espo/Core/Select/SelectBuilderFactory.php +++ b/application/Espo/Core/Select/SelectBuilderFactory.php @@ -29,21 +29,15 @@ namespace Espo\Core\Select; -use Espo\Core\{ - InjectableFactory, -}; +use Espo\Core\InjectableFactory; /** * Creates instances of Select Builder. */ class SelectBuilderFactory { - private $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} public function create(): SelectBuilder { diff --git a/application/Espo/Core/Select/SelectManager.php b/application/Espo/Core/Select/SelectManager.php index e5a9403e68..10afd9be44 100644 --- a/application/Espo/Core/Select/SelectManager.php +++ b/application/Espo/Core/Select/SelectManager.php @@ -29,26 +29,20 @@ namespace Espo\Core\Select; -use Espo\Core\Exceptions\{ - Error, - Forbidden, -}; +use Espo\Core\Exceptions\Error; +use Espo\Core\Exceptions\Forbidden; -use Espo\Core\{ - Acl, - AclManager, - InjectableFactory, - Utils\Metadata, - Utils\Config, - Utils\FieldUtil, - ORM\EntityManager, -}; +use Espo\Core\Acl; +use Espo\Core\AclManager; +use Espo\Core\InjectableFactory; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\FieldUtil; +use Espo\Core\Utils\Metadata; -use Espo\ORM\{ - QueryComposer\BaseQueryComposer as QueryComposer, - Query\Select as SelectQuery, - Entity, -}; +use Espo\ORM\Entity; +use Espo\ORM\Query\Select as SelectQuery; +use Espo\ORM\QueryComposer\BaseQueryComposer as QueryComposer; use Espo\Entities\User; diff --git a/application/Espo/Core/Select/SelectManagerFactory.php b/application/Espo/Core/Select/SelectManagerFactory.php index e5a6b75c0a..95d9875f6e 100644 --- a/application/Espo/Core/Select/SelectManagerFactory.php +++ b/application/Espo/Core/Select/SelectManagerFactory.php @@ -31,11 +31,9 @@ namespace Espo\Core\Select; use Espo\Core\Utils\Acl\UserAclManagerProvider; -use Espo\Core\{ - InjectableFactory, - Acl, - Utils\ClassFinder, -}; +use Espo\Core\Acl; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\ClassFinder; use Espo\Entities\User; diff --git a/application/Espo/Core/Upgrades/Actions/Base.php b/application/Espo/Core/Upgrades/Actions/Base.php index 547a5aafbb..01310e0c57 100644 --- a/application/Espo/Core/Upgrades/Actions/Base.php +++ b/application/Espo/Core/Upgrades/Actions/Base.php @@ -33,17 +33,14 @@ use Espo\Core\Utils\Util; use Espo\Core\Utils\System; use Espo\Core\Utils\Json; use Espo\Core\Exceptions\Error; - use Espo\Core\Utils\File\Manager as FileManager; - -use Espo\Core\{ - Container, - InjectableFactory, - Upgrades\ActionManager, - Utils\File\ZipArchive, - Utils\Config\ConfigWriter, - Utils\Database\Helper as DatabaseHelper, - Utils\Log}; +use Espo\Core\Container; +use Espo\Core\InjectableFactory; +use Espo\Core\Upgrades\ActionManager; +use Espo\Core\Utils\Config\ConfigWriter; +use Espo\Core\Utils\Database\Helper as DatabaseHelper; +use Espo\Core\Utils\File\ZipArchive; +use Espo\Core\Utils\Log; use Composer\Semver\Semver; diff --git a/application/Espo/Hooks/Common/Webhook.php b/application/Espo/Hooks/Common/Webhook.php index 6b1ebad563..3b33e48882 100644 --- a/application/Espo/Hooks/Common/Webhook.php +++ b/application/Espo/Hooks/Common/Webhook.php @@ -32,24 +32,16 @@ namespace Espo\Hooks\Common; use Espo\ORM\Entity; use Espo\Core\ORM\Entity as CoreEntity; -use Espo\Core\{ - ORM\Repository\Option\SaveOption, - Utils\Metadata, - Webhook\Manager as WebhookManager}; +use Espo\Core\ORM\Repository\Option\SaveOption; +use Espo\Core\Utils\Metadata; +use Espo\Core\Webhook\Manager as WebhookManager; class Webhook { public static int $order = 101; - private Metadata $metadata; - - private WebhookManager $webhookManager; - - public function __construct(Metadata $metadata, WebhookManager $webhookManager) - { - $this->metadata = $metadata; - $this->webhookManager = $webhookManager; - } + public function __construct(private Metadata $metadata, private WebhookManager $webhookManager) + {} /** * @param array $options diff --git a/application/Espo/Hooks/Notification/WebSocketSubmit.php b/application/Espo/Hooks/Notification/WebSocketSubmit.php index 15c05248d5..a870b0eccc 100644 --- a/application/Espo/Hooks/Notification/WebSocketSubmit.php +++ b/application/Espo/Hooks/Notification/WebSocketSubmit.php @@ -31,24 +31,15 @@ namespace Espo\Hooks\Notification; use Espo\ORM\Entity; -use Espo\Core\{ - Utils\Config, - WebSocket\Submission as WebSocketSubmission, -}; +use Espo\Core\Utils\Config; +use Espo\Core\WebSocket\Submission as WebSocketSubmission; class WebSocketSubmit { public static int $order = 20; - private WebSocketSubmission $webSocketSubmission; - - private $config; - - public function __construct(WebSocketSubmission $webSocketSubmission, Config $config) - { - $this->webSocketSubmission = $webSocketSubmission; - $this->config = $config; - } + public function __construct(private WebSocketSubmission $webSocketSubmission, private Config $config) + {} public function afterSave(Entity $entity): void { diff --git a/application/Espo/Hooks/Portal/WriteConfig.php b/application/Espo/Hooks/Portal/WriteConfig.php index ae0da0ec41..4e4f438717 100644 --- a/application/Espo/Hooks/Portal/WriteConfig.php +++ b/application/Espo/Hooks/Portal/WriteConfig.php @@ -30,25 +30,14 @@ namespace Espo\Hooks\Portal; use Espo\ORM\Entity; - use Espo\Entities\Portal; - -use Espo\Core\{ - Utils\Config, - Utils\Config\ConfigWriter, -}; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Config\ConfigWriter; class WriteConfig { - private $config; - - private $configWriter; - - public function __construct(Config $config, ConfigWriter $configWriter) - { - $this->config = $config; - $this->configWriter = $configWriter; - } + public function __construct(private Config $config, private ConfigWriter $configWriter) + {} /** * @param Portal $entity diff --git a/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php b/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php index 03cda2ef8a..645fd94083 100644 --- a/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php +++ b/application/Espo/Modules/Crm/Business/Reminder/EmailReminder.php @@ -31,17 +31,13 @@ namespace Espo\Modules\Crm\Business\Reminder; use Espo\ORM\Entity; use Espo\Core\ORM\Entity as CoreEntity; - use Espo\Core\Utils\Util; - -use Espo\Core\{ - ORM\EntityManager, - Utils\TemplateFileManager, - Mail\EmailSender, - Utils\Config, - Htmlizer\HtmlizerFactory as HtmlizerFactory, - Utils\Language, -}; +use Espo\Core\Htmlizer\HtmlizerFactory as HtmlizerFactory; +use Espo\Core\Mail\EmailSender; +use Espo\Core\ORM\EntityManager; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Language; +use Espo\Core\Utils\TemplateFileManager; class EmailReminder { diff --git a/application/Espo/Modules/Crm/Classes/Acl/CampaignLogRecord/OwnershipChecker.php b/application/Espo/Modules/Crm/Classes/Acl/CampaignLogRecord/OwnershipChecker.php index 947f1eaaa8..7e0c75021d 100644 --- a/application/Espo/Modules/Crm/Classes/Acl/CampaignLogRecord/OwnershipChecker.php +++ b/application/Espo/Modules/Crm/Classes/Acl/CampaignLogRecord/OwnershipChecker.php @@ -30,31 +30,21 @@ namespace Espo\Modules\Crm\Classes\Acl\CampaignLogRecord; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\CampaignLogRecord; use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, - Acl\OwnershipTeamChecker, - AclManager, - ORM\EntityManager, -}; +use Espo\Core\Acl\OwnershipOwnChecker; +use Espo\Core\Acl\OwnershipTeamChecker; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; /** - * @implements OwnershipOwnChecker<\Espo\Modules\Crm\Entities\CampaignLogRecord> - * @implements OwnershipTeamChecker<\Espo\Modules\Crm\Entities\CampaignLogRecord> + * @implements OwnershipOwnChecker + * @implements OwnershipTeamChecker */ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker { - private $aclManager; - - private $entityManager; - - public function __construct(AclManager $aclManager, EntityManager $entityManager) - { - $this->aclManager = $aclManager; - $this->entityManager = $entityManager; - } + public function __construct(private AclManager $aclManager, private EntityManager $entityManager) + {} public function checkOwn(User $user, Entity $entity): bool { diff --git a/application/Espo/Modules/Crm/Classes/Acl/CampaignTrackingUrl/OwnershipChecker.php b/application/Espo/Modules/Crm/Classes/Acl/CampaignTrackingUrl/OwnershipChecker.php index 226fc7ee36..7e2fa97209 100644 --- a/application/Espo/Modules/Crm/Classes/Acl/CampaignTrackingUrl/OwnershipChecker.php +++ b/application/Espo/Modules/Crm/Classes/Acl/CampaignTrackingUrl/OwnershipChecker.php @@ -30,31 +30,21 @@ namespace Espo\Modules\Crm\Classes\Acl\CampaignTrackingUrl; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\CampaignTrackingUrl; use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, - Acl\OwnershipTeamChecker, - AclManager, - ORM\EntityManager, -}; +use Espo\Core\Acl\OwnershipOwnChecker; +use Espo\Core\Acl\OwnershipTeamChecker; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; /** - * @implements OwnershipOwnChecker<\Espo\Modules\Crm\Entities\CampaignTrackingUrl> - * @implements OwnershipTeamChecker<\Espo\Modules\Crm\Entities\CampaignTrackingUrl> + * @implements OwnershipOwnChecker + * @implements OwnershipTeamChecker */ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker { - private $aclManager; - - private $entityManager; - - public function __construct(AclManager $aclManager, EntityManager $entityManager) - { - $this->aclManager = $aclManager; - $this->entityManager = $entityManager; - } + public function __construct(private AclManager $aclManager, private EntityManager $entityManager) + {} public function checkOwn(User $user, Entity $entity): bool { diff --git a/application/Espo/Modules/Crm/Classes/Acl/MassEmail/OwnershipChecker.php b/application/Espo/Modules/Crm/Classes/Acl/MassEmail/OwnershipChecker.php index eb79c5650d..bd56f6400d 100644 --- a/application/Espo/Modules/Crm/Classes/Acl/MassEmail/OwnershipChecker.php +++ b/application/Espo/Modules/Crm/Classes/Acl/MassEmail/OwnershipChecker.php @@ -30,33 +30,23 @@ namespace Espo\Modules\Crm\Classes\Acl\MassEmail; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\MassEmail; use Espo\ORM\Entity; - -use Espo\Core\{ - Acl\OwnershipOwnChecker, - Acl\OwnershipTeamChecker, - AclManager, - ORM\EntityManager, -}; +use Espo\Core\Acl\OwnershipOwnChecker; +use Espo\Core\Acl\OwnershipTeamChecker; +use Espo\Core\AclManager; +use Espo\Core\ORM\EntityManager; /** - * @implements OwnershipOwnChecker<\Espo\Modules\Crm\Entities\MassEmail> - * @implements OwnershipTeamChecker<\Espo\Modules\Crm\Entities\MassEmail> + * @implements OwnershipOwnChecker + * @implements OwnershipTeamChecker */ class OwnershipChecker implements OwnershipOwnChecker, OwnershipTeamChecker { - private $aclManager; - - private $entityManager; - public function __construct( - AclManager $aclManager, - EntityManager $entityManager - ) { - $this->aclManager = $aclManager; - $this->entityManager = $entityManager; - } + private AclManager $aclManager, + private EntityManager $entityManager + ) {} public function checkOwn(User $user, Entity $entity): bool { diff --git a/application/Espo/Modules/Crm/Classes/AclPortal/Contact/OwnershipChecker.php b/application/Espo/Modules/Crm/Classes/AclPortal/Contact/OwnershipChecker.php index e592a848ba..a3df487df6 100644 --- a/application/Espo/Modules/Crm/Classes/AclPortal/Contact/OwnershipChecker.php +++ b/application/Espo/Modules/Crm/Classes/AclPortal/Contact/OwnershipChecker.php @@ -30,26 +30,19 @@ namespace Espo\Modules\Crm\Classes\AclPortal\Contact; use Espo\Entities\User; - +use Espo\Modules\Crm\Entities\Contact; use Espo\ORM\Entity; - -use Espo\Core\{ - Portal\Acl\DefaultOwnershipChecker, - Portal\Acl\OwnershipAccountChecker, - Portal\Acl\OwnershipContactChecker, -}; +use Espo\Core\Portal\Acl\DefaultOwnershipChecker; +use Espo\Core\Portal\Acl\OwnershipAccountChecker; +use Espo\Core\Portal\Acl\OwnershipContactChecker; /** - * @implements OwnershipAccountChecker<\Espo\Modules\Crm\Entities\Contact> - * @implements OwnershipContactChecker<\Espo\Modules\Crm\Entities\Contact> + * @implements OwnershipAccountChecker + * @implements OwnershipContactChecker */ class OwnershipChecker implements OwnershipAccountChecker, OwnershipContactChecker { - private $defaultOwnershipChecker; - - public function __construct(DefaultOwnershipChecker $defaultOwnershipChecker) { - $this->defaultOwnershipChecker = $defaultOwnershipChecker; - } + public function __construct(private DefaultOwnershipChecker $defaultOwnershipChecker) {} public function checkContact(User $user, Entity $entity): bool { diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php index 4511ad6684..5812787038 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Call/PhoneNumberMapLoader.php @@ -29,31 +29,24 @@ namespace Espo\Modules\Crm\Classes\FieldProcessing\Call; +use Espo\Modules\Crm\Entities\Call; use Espo\ORM\Entity; - use Espo\Core\ORM\Entity as CoreEntity; - -use Espo\Core\{ - FieldProcessing\Loader, - FieldProcessing\Loader\Params, - ORM\EntityManager, -}; +use Espo\Core\FieldProcessing\Loader; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; use stdClass; /** - * @implements Loader<\Espo\Modules\Crm\Entities\Call> + * @implements Loader */ class PhoneNumberMapLoader implements Loader { private const ERASED_PART = 'ERASED:'; - private $entityManager; - - public function __construct(EntityManager $entityManager) - { - $this->entityManager = $entityManager; - } + public function __construct(private EntityManager $entityManager) + {} public function process(Entity $entity, Params $params): void { diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php index 987cbc2fbf..40c25cd041 100644 --- a/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php +++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/TargetList/OptedOutCountLoader.php @@ -30,35 +30,22 @@ namespace Espo\Modules\Crm\Classes\FieldProcessing\TargetList; use Espo\ORM\Entity; - use Espo\Modules\Crm\Entities\TargetList; - use Espo\Core\Utils\Metadata; - -use Espo\Core\{ - FieldProcessing\Loader, - FieldProcessing\Loader\Params, - ORM\EntityManager, -}; +use Espo\Core\FieldProcessing\Loader; +use Espo\Core\FieldProcessing\Loader\Params; +use Espo\Core\ORM\EntityManager; /** * @implements Loader */ class OptedOutCountLoader implements Loader { - /** - * @var string[] - */ + /** @var string[] */ private array $targetLinkList; - private EntityManager $entityManager; - - private Metadata $metadata; - - public function __construct(EntityManager $entityManager, Metadata $metadata) + public function __construct(private EntityManager $entityManager, private Metadata $metadata) { - $this->entityManager = $entityManager; - $this->metadata = $metadata; $this->targetLinkList = $this->metadata->get(['scopes', 'TargetList', 'targetLinkList']) ?? []; } diff --git a/application/Espo/Modules/Crm/Classes/Select/Meeting/Where/DateTimeItemTransformer.php b/application/Espo/Modules/Crm/Classes/Select/Meeting/Where/DateTimeItemTransformer.php index b1cd9d158e..91fab29bac 100644 --- a/application/Espo/Modules/Crm/Classes/Select/Meeting/Where/DateTimeItemTransformer.php +++ b/application/Espo/Modules/Crm/Classes/Select/Meeting/Where/DateTimeItemTransformer.php @@ -29,10 +29,8 @@ namespace Espo\Modules\Crm\Classes\Select\Meeting\Where; -use Espo\Core\{ - Select\Where\DateTimeItemTransformer as DateTimeItemTransformerOriginal, - Select\Where\Item, -}; +use Espo\Core\Select\Where\DateTimeItemTransformer as DateTimeItemTransformerOriginal; +use Espo\Core\Select\Where\Item; /** * Extends to take into account DateStartDate and DateEndDate fields. @@ -45,27 +43,27 @@ class DateTimeItemTransformer extends DateTimeItemTransformerOriginal $value = $item->getValue(); $attribute = $item->getAttribute(); - $tranformedItem = parent::transform($item); + $transformedItem = parent::transform($item); if (!in_array($attribute, ['dateStart', 'dateEnd'])) { - return $tranformedItem; + return $transformedItem; } if (in_array($type, ['isNull', 'ever', 'isNotNull'])) { - return $tranformedItem; + return $transformedItem; } $attributeDate = $attribute . 'Date'; if (is_string($value)) { if (strlen($value) > 11) { - return $tranformedItem; + return $transformedItem; } } else if (is_array($value)) { foreach ($value as $valueItem) { if (is_string($valueItem) && strlen($valueItem) > 11) { - return $tranformedItem; + return $transformedItem; } } } @@ -83,7 +81,7 @@ class DateTimeItemTransformer extends DateTimeItemTransformerOriginal [ 'type' => 'and', 'value' => [ - $tranformedItem->getRaw(), + $transformedItem->getRaw(), [ 'type' => 'isNull', 'attribute' => $attributeDate, diff --git a/application/Espo/Modules/Crm/Entities/Account.php b/application/Espo/Modules/Crm/Entities/Account.php index d527251aa1..65ffd0d383 100644 --- a/application/Espo/Modules/Crm/Entities/Account.php +++ b/application/Espo/Modules/Crm/Entities/Account.php @@ -29,13 +29,12 @@ namespace Espo\Modules\Crm\Entities; -use Espo\Core\{ - Field\Link, - Field\LinkMultiple, - ORM\Entity, - Field\EmailAddressGroup, - Field\PhoneNumberGroup, - Field\Address}; +use Espo\Core\Field\Address; +use Espo\Core\Field\EmailAddressGroup; +use Espo\Core\Field\Link; +use Espo\Core\Field\LinkMultiple; +use Espo\Core\Field\PhoneNumberGroup; +use Espo\Core\ORM\Entity; class Account extends Entity { diff --git a/application/Espo/Modules/Crm/Entities/Opportunity.php b/application/Espo/Modules/Crm/Entities/Opportunity.php index 57dac1e5b5..be5a50c5f0 100644 --- a/application/Espo/Modules/Crm/Entities/Opportunity.php +++ b/application/Espo/Modules/Crm/Entities/Opportunity.php @@ -29,12 +29,11 @@ namespace Espo\Modules\Crm\Entities; -use Espo\Core\{ - Field\Link, - Field\LinkMultiple, - ORM\Entity, - Field\Currency, - Field\Date}; +use Espo\Core\Field\Currency; +use Espo\Core\Field\Date; +use Espo\Core\Field\Link; +use Espo\Core\Field\LinkMultiple; +use Espo\Core\ORM\Entity; class Opportunity extends Entity { diff --git a/application/Espo/Modules/Crm/Entities/Task.php b/application/Espo/Modules/Crm/Entities/Task.php index 26da493f28..ecadab432c 100644 --- a/application/Espo/Modules/Crm/Entities/Task.php +++ b/application/Espo/Modules/Crm/Entities/Task.php @@ -29,12 +29,10 @@ namespace Espo\Modules\Crm\Entities; -use Espo\Core\{ - Field\Link, - Field\LinkMultiple, - ORM\Entity, - Field\DateTimeOptional, -}; +use Espo\Core\Field\DateTimeOptional; +use Espo\Core\Field\Link; +use Espo\Core\Field\LinkMultiple; +use Espo\Core\ORM\Entity; class Task extends Entity { diff --git a/application/Espo/Services/Import.php b/application/Espo/Services/Import.php index ad49a0f381..497e63d0bc 100644 --- a/application/Espo/Services/Import.php +++ b/application/Espo/Services/Import.php @@ -32,17 +32,15 @@ namespace Espo\Services; use Espo\Repositories\Import as Repository; use Espo\Entities\Import as ImportEntity; -use Espo\Core\{ - Acl\Table, - Exceptions\Forbidden, - Exceptions\NotFoundSilent, - Record\Collection as RecordCollection, - Select\SearchParams, - FieldProcessing\ListLoadProcessor, -}; +use Espo\Core\Acl\Table; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\NotFoundSilent; +use Espo\Core\FieldProcessing\ListLoadProcessor; +use Espo\Core\Record\Collection as RecordCollection; +use Espo\Core\Select\SearchParams; /** - * @extends Record<\Espo\Entities\Import> + * @extends Record */ class Import extends Record { diff --git a/application/Espo/Services/Integration.php b/application/Espo/Services/Integration.php index 58f34d7ce1..0679dc51cd 100644 --- a/application/Espo/Services/Integration.php +++ b/application/Espo/Services/Integration.php @@ -29,15 +29,13 @@ namespace Espo\Services; -use Espo\{ - Core\Exceptions\Forbidden, - Core\Exceptions\NotFound, - Core\Utils\Config, - Core\Utils\Config\ConfigWriter, - ORM\EntityManager, - ORM\Entity, - Entities\User, -}; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\NotFound; +use Espo\Core\Utils\Config; +use Espo\Core\Utils\Config\ConfigWriter; +use Espo\Entities\User; +use Espo\ORM\Entity; +use Espo\ORM\EntityManager; use stdClass; diff --git a/application/Espo/Tools/DataPrivacy/Erasor.php b/application/Espo/Tools/DataPrivacy/Erasor.php index 8697763648..31560343db 100644 --- a/application/Espo/Tools/DataPrivacy/Erasor.php +++ b/application/Espo/Tools/DataPrivacy/Erasor.php @@ -29,14 +29,12 @@ namespace Espo\Tools\DataPrivacy; +use Espo\Core\Acl\Table; use Espo\Core\Exceptions\Forbidden; use Espo\Core\Exceptions\NotFound; - -use Espo\Core\{ - Record\ServiceContainer as RecordServiceContainer, - FieldProcessing\EmailAddress\AccessChecker as EmailAddressAccessChecker, - FieldProcessing\PhoneNumber\AccessChecker as PhoneNumberAccessChecker, -}; +use Espo\Core\FieldProcessing\EmailAddress\AccessChecker as EmailAddressAccessChecker; +use Espo\Core\FieldProcessing\PhoneNumber\AccessChecker as PhoneNumberAccessChecker; +use Espo\Core\Record\ServiceContainer as RecordServiceContainer; use Espo\Core\Di; @@ -58,21 +56,11 @@ class Erasor implements use Di\FieldUtilSetter; use Di\UserSetter; - private $recordServiceContainer; - - private $emailAddressAccessChecker; - - private $phoneNumberAccessChecker; - public function __construct( - RecordServiceContainer $recordServiceContainer, - EmailAddressAccessChecker $emailAddressAccessChecker, - PhoneNumberAccessChecker $phoneNumberAccessChecker - ) { - $this->recordServiceContainer = $recordServiceContainer; - $this->emailAddressAccessChecker = $emailAddressAccessChecker; - $this->phoneNumberAccessChecker = $phoneNumberAccessChecker; - } + private RecordServiceContainer $recordServiceContainer, + private EmailAddressAccessChecker $emailAddressAccessChecker, + private PhoneNumberAccessChecker $phoneNumberAccessChecker + ) {} /** * @param string[] $fieldList @@ -81,7 +69,7 @@ class Erasor implements */ public function erase(string $entityType, string $id, array $fieldList): void { - if ($this->acl->get('dataPrivacyPermission') === 'no') { + if ($this->acl->getPermissionLevel('dataPrivacyPermission') === Table::LEVEL_NO) { throw new Forbidden(); } @@ -93,11 +81,11 @@ class Erasor implements throw new NotFound(); } - if (!$this->acl->check($entity, 'edit')) { + if (!$this->acl->check($entity, Table::ACTION_EDIT)) { throw new Forbidden("No edit access."); } - $forbiddenFieldList = $this->acl->getScopeForbiddenFieldList($entityType, 'edit'); + $forbiddenFieldList = $this->acl->getScopeForbiddenFieldList($entityType, Table::ACTION_EDIT); foreach ($fieldList as $field) { if (in_array($field, $forbiddenFieldList)) { diff --git a/application/Espo/Tools/FieldManager/Hooks/AutoincrementType.php b/application/Espo/Tools/FieldManager/Hooks/AutoincrementType.php index b014a76f5a..be978b3009 100644 --- a/application/Espo/Tools/FieldManager/Hooks/AutoincrementType.php +++ b/application/Espo/Tools/FieldManager/Hooks/AutoincrementType.php @@ -29,10 +29,8 @@ namespace Espo\Tools\FieldManager\Hooks; -use Espo\Core\{ - Di, - Exceptions\Error, -}; +use Espo\Core\Di; +use Espo\Core\Exceptions\Error; class AutoincrementType implements Di\MetadataAware { diff --git a/application/Espo/Tools/LabelManager/LabelManager.php b/application/Espo/Tools/LabelManager/LabelManager.php index efadc54ef5..48cd1f64e5 100644 --- a/application/Espo/Tools/LabelManager/LabelManager.php +++ b/application/Espo/Tools/LabelManager/LabelManager.php @@ -30,12 +30,9 @@ namespace Espo\Tools\LabelManager; use Espo\Core\Utils\Json; - -use Espo\Core\{ - Di, - Utils\Language, - InjectableFactory, -}; +use Espo\Core\Di; +use Espo\Core\InjectableFactory; +use Espo\Core\Utils\Language; use stdClass; @@ -57,12 +54,8 @@ class LabelManager implements 'Global.sets', ]; - private InjectableFactory $injectableFactory; - - public function __construct(InjectableFactory $injectableFactory) - { - $this->injectableFactory = $injectableFactory; - } + public function __construct(private InjectableFactory $injectableFactory) + {} /** * @return string[] diff --git a/clear_cache.php b/clear_cache.php index 40800ec8a6..96347e0898 100644 --- a/clear_cache.php +++ b/clear_cache.php @@ -29,9 +29,7 @@ include "bootstrap.php"; -use Espo\Core\{ - Application, - ApplicationRunners\ClearCache, -}; +use Espo\Core\Application; +use Espo\Core\ApplicationRunners\ClearCache; (new Application())->run(ClearCache::class); diff --git a/public/api/v1/index.php b/public/api/v1/index.php index 171ec261df..a11f383f5f 100644 --- a/public/api/v1/index.php +++ b/public/api/v1/index.php @@ -29,9 +29,7 @@ require_once('../../../bootstrap.php'); -use Espo\Core\{ - Application, - ApplicationRunners\Api, -}; +use Espo\Core\Application; +use Espo\Core\ApplicationRunners\Api; (new Application())->run(Api::class); diff --git a/public/api/v1/portal-access/index.php b/public/api/v1/portal-access/index.php index b7413b9cb1..f776ead574 100644 --- a/public/api/v1/portal-access/index.php +++ b/public/api/v1/portal-access/index.php @@ -29,11 +29,9 @@ require_once('../../../../bootstrap.php'); -use Espo\Core\{ - Portal\Application, - Portal\ApplicationRunners\Api, - Portal\Utils\Url, -}; +use Espo\Core\Portal\Application; +use Espo\Core\Portal\ApplicationRunners\Api; +use Espo\Core\Portal\Utils\Url; $portalId = Url::detectPortalIdForApi(); diff --git a/tests/integration/Espo/Core/Select/SelectBuilderTest.php b/tests/integration/Espo/Core/Select/SelectBuilderTest.php index a2c8c69730..1b252713b9 100644 --- a/tests/integration/Espo/Core/Select/SelectBuilderTest.php +++ b/tests/integration/Espo/Core/Select/SelectBuilderTest.php @@ -29,12 +29,10 @@ namespace tests\integration\Espo\Core\Select; -use Espo\Core\{ - Application, - Container, - Select\SelectBuilderFactory, - Select\SearchParams, -}; +use Espo\Core\Application; +use Espo\Core\Container; +use Espo\Core\Select\SearchParams; +use Espo\Core\Select\SelectBuilderFactory; use Espo\Classes\Select\Email\AdditionalAppliers\Main as EmailAdditionalApplier; use Espo\ORM\Query\Select; diff --git a/tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php b/tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php index 9052682bc0..2380c5733d 100644 --- a/tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php +++ b/tests/unit/Espo/Core/Select/Bool/FilterFactoryTest.php @@ -29,19 +29,15 @@ namespace tests\unit\Espo\Core\Select\Bool; -use Espo\Core\{ - Select\Bool\FilterFactory as BoolFilterFactory, - Select\Bool\Filters\Followed, - Utils\Metadata, - InjectableFactory, - Binding\BindingContainer, - Binding\Binder, - Binding\BindingData, -}; +use Espo\Core\Binding\Binder; +use Espo\Core\Binding\BindingContainer; +use Espo\Core\Binding\BindingData; +use Espo\Core\InjectableFactory; +use Espo\Core\Select\Bool\FilterFactory as BoolFilterFactory; +use Espo\Core\Select\Bool\Filters\Followed; +use Espo\Core\Utils\Metadata; -use Espo\{ - Entities\User, -}; +use Espo\Entities\User; class FilterFactoryTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/unit/Espo/Core/Select/SelectBuilderTest.php b/tests/unit/Espo/Core/Select/SelectBuilderTest.php index ed930dd725..cd243ae6f6 100644 --- a/tests/unit/Espo/Core/Select/SelectBuilderTest.php +++ b/tests/unit/Espo/Core/Select/SelectBuilderTest.php @@ -29,28 +29,24 @@ namespace tests\unit\Espo\Core\Select; -use Espo\Core\Select\{ - SelectBuilder, - SearchParams, - Applier\Factory as ApplierFactory, - Where\Applier as WhereApplier, - Select\Applier as SelectApplier, - Order\Applier as OrderApplier, - AccessControl\Applier as AccessControlFilterApplier, - Primary\Applier as PrimaryFilterApplier, - Text\Applier as TextFilterApplier, - Applier\Appliers\Additional as AdditionalApplier, - Applier\Appliers\Limit as LimitApplier, - Bool\Applier as BoolFilterListApplier, - Where\Params as WhereParams, - Order\Params as OrderParams, - Text\FilterParams as TextFilterParams, -}; +use Espo\Core\Select\AccessControl\Applier as AccessControlFilterApplier; +use Espo\Core\Select\Applier\Appliers\Additional as AdditionalApplier; +use Espo\Core\Select\Applier\Appliers\Limit as LimitApplier; +use Espo\Core\Select\Applier\Factory as ApplierFactory; +use Espo\Core\Select\Bool\Applier as BoolFilterListApplier; +use Espo\Core\Select\Order\Applier as OrderApplier; +use Espo\Core\Select\Order\Params as OrderParams; +use Espo\Core\Select\Primary\Applier as PrimaryFilterApplier; +use Espo\Core\Select\SearchParams; +use Espo\Core\Select\Select\Applier as SelectApplier; +use Espo\Core\Select\SelectBuilder; +use Espo\Core\Select\Text\Applier as TextFilterApplier; +use Espo\Core\Select\Text\FilterParams as TextFilterParams; +use Espo\Core\Select\Where\Applier as WhereApplier; +use Espo\Core\Select\Where\Params as WhereParams; -use Espo\{ - ORM\Query\SelectBuilder as QueryBuilder, - Entities\User, -}; +use Espo\Entities\User; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class SelectBuilderTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/unit/Espo/Core/Select/Where/ConverterFactoryTest.php b/tests/unit/Espo/Core/Select/Where/ConverterFactoryTest.php index dfad9c7fec..1553597f40 100644 --- a/tests/unit/Espo/Core/Select/Where/ConverterFactoryTest.php +++ b/tests/unit/Espo/Core/Select/Where/ConverterFactoryTest.php @@ -29,22 +29,18 @@ namespace tests\unit\Espo\Core\Select\Where; -use Espo\Core\{ - Select\Where\ConverterFactory, - Select\Where\Converter, - Select\Where\DateTimeItemTransformer, - Select\Where\ItemGeneralConverter, - Select\Where\ItemConverter, - Utils\Metadata, - InjectableFactory, - Binding\BindingContainer, - Binding\Binder, - Binding\BindingData, -}; +use Espo\Core\Binding\Binder; +use Espo\Core\Binding\BindingContainer; +use Espo\Core\Binding\BindingData; +use Espo\Core\InjectableFactory; +use Espo\Core\Select\Where\Converter; +use Espo\Core\Select\Where\ConverterFactory; +use Espo\Core\Select\Where\DateTimeItemTransformer; +use Espo\Core\Select\Where\ItemConverter; +use Espo\Core\Select\Where\ItemGeneralConverter; +use Espo\Core\Utils\Metadata; -use Espo\{ - Entities\User, -}; +use Espo\Entities\User; class ConverterFactoryTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/unit/Espo/Core/Select/Where/ScannerTest.php b/tests/unit/Espo/Core/Select/Where/ScannerTest.php index f93bb08538..7e9ac2dfb3 100644 --- a/tests/unit/Espo/Core/Select/Where/ScannerTest.php +++ b/tests/unit/Espo/Core/Select/Where/ScannerTest.php @@ -29,14 +29,12 @@ namespace tests\unit\Espo\Core\Select\Where; -use Espo\{ - Core\Select\Where\Scanner, - Core\Select\Where\Item, - ORM\EntityManager, - ORM\BaseEntity as Entity, - ORM\Query\Select as Query, - ORM\Query\SelectBuilder as QueryBuilder, -}; +use Espo\Core\Select\Where\Item; +use Espo\Core\Select\Where\Scanner; +use Espo\ORM\BaseEntity as Entity; +use Espo\ORM\EntityManager; +use Espo\ORM\Query\Select as Query; +use Espo\ORM\Query\SelectBuilder as QueryBuilder; class ScannerTest extends \PHPUnit\Framework\TestCase {