diff --git a/application/Espo/EntryPoints/Attachment.php b/application/Espo/EntryPoints/Attachment.php index b8ec347028..25342dd203 100644 --- a/application/Espo/EntryPoints/Attachment.php +++ b/application/Espo/EntryPoints/Attachment.php @@ -30,42 +30,25 @@ namespace Espo\EntryPoints; use Espo\Core\Utils\Metadata; - use Espo\Entities\Attachment as AttachmentEntity; - -use Espo\Core\{ - Exceptions\NotFound, - Exceptions\Forbidden, - Exceptions\BadRequest, - EntryPoint\EntryPoint, - Api\Request, - Api\Response, - FileStorage\Manager as FileStorageManager, - ORM\EntityManager, - Acl, -}; +use Espo\Core\Acl; +use Espo\Core\Api\Request; +use Espo\Core\Api\Response; +use Espo\Core\EntryPoint\EntryPoint; +use Espo\Core\Exceptions\BadRequest; +use Espo\Core\Exceptions\Forbidden; +use Espo\Core\Exceptions\NotFound; +use Espo\Core\FileStorage\Manager as FileStorageManager; +use Espo\Core\ORM\EntityManager; class Attachment implements EntryPoint { - private $fileStorageManager; - - private $entityManager; - - private $acl; - - private $metadata; - public function __construct( - FileStorageManager $fileStorageManager, - EntityManager $entityManager, - Acl $acl, - Metadata $metadata - ) { - $this->fileStorageManager = $fileStorageManager; - $this->entityManager = $entityManager; - $this->acl = $acl; - $this->metadata = $metadata; - } + private FileStorageManager $fileStorageManager, + private EntityManager $entityManager, + private Acl $acl, + private Metadata $metadata + ) {} public function run(Request $request, Response $response): void { diff --git a/application/Espo/EntryPoints/ChangePassword.php b/application/Espo/EntryPoints/ChangePassword.php index b18e5249f8..843a65b17d 100644 --- a/application/Espo/EntryPoints/ChangePassword.php +++ b/application/Espo/EntryPoints/ChangePassword.php @@ -30,36 +30,24 @@ namespace Espo\EntryPoints; use Espo\Core\Exceptions\BadRequest; - use Espo\Entities\PasswordChangeRequest; - use Espo\Core\Utils\Client\ActionRenderer; - use Espo\Core\EntryPoint\EntryPoint; use Espo\Core\EntryPoint\Traits\NoAuth; use Espo\Core\Utils\Config; - use Espo\Core\Api\Request; use Espo\Core\Api\Response; - use Espo\ORM\EntityManager; class ChangePassword implements EntryPoint { use NoAuth; - private Config $config; - - private EntityManager $entityManager; - - private ActionRenderer $actionRenderer; - - public function __construct(Config $config, EntityManager $entityManager, ActionRenderer $actionRenderer) - { - $this->config = $config; - $this->entityManager = $entityManager; - $this->actionRenderer = $actionRenderer; - } + public function __construct( + private Config $config, + private EntityManager $entityManager, + private ActionRenderer $actionRenderer + ) {} public function run(Request $request, Response $response): void { diff --git a/application/Espo/EntryPoints/LoginAs.php b/application/Espo/EntryPoints/LoginAs.php index aa8cbc37f6..41bd7c8e29 100644 --- a/application/Espo/EntryPoints/LoginAs.php +++ b/application/Espo/EntryPoints/LoginAs.php @@ -41,12 +41,7 @@ class LoginAs implements EntryPoint { use NoAuth; - private ClientManager $clientManager; - - public function __construct(ClientManager $clientManager) - { - $this->clientManager = $clientManager; - } + public function __construct(private ClientManager $clientManager) {} /** * @throws BadRequest diff --git a/application/Espo/EntryPoints/OauthCallback.php b/application/Espo/EntryPoints/OauthCallback.php index 93b68e3705..624af7b9f7 100644 --- a/application/Espo/EntryPoints/OauthCallback.php +++ b/application/Espo/EntryPoints/OauthCallback.php @@ -29,12 +29,10 @@ namespace Espo\EntryPoints; -use Espo\Core\{ - EntryPoint\EntryPoint, - EntryPoint\Traits\NoAuth, - Api\Request, - Api\Response, -}; +use Espo\Core\Api\Request; +use Espo\Core\Api\Response; +use Espo\Core\EntryPoint\EntryPoint; +use Espo\Core\EntryPoint\Traits\NoAuth; class OauthCallback implements EntryPoint { diff --git a/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php b/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php index cef53682d2..faa3ba0684 100644 --- a/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php +++ b/application/Espo/Modules/Crm/EntryPoints/CampaignTrackOpened.php @@ -45,14 +45,10 @@ class CampaignTrackOpened implements EntryPoint { use NoAuth; - private EntityManager $entityManager; - private LogService $service; - - public function __construct(EntityManager $entityManager, LogService $service) - { - $this->entityManager = $entityManager; - $this->service = $service; - } + public function __construct( + private EntityManager $entityManager, + private LogService $service + ) {} /** * @throws BadRequest diff --git a/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php b/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php index be41b82c1f..46da8935bc 100644 --- a/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php +++ b/application/Espo/Modules/Crm/EntryPoints/CampaignUrl.php @@ -47,32 +47,21 @@ use Espo\Core\Utils\ClientManager; use Espo\Core\Utils\Hasher; use Espo\Core\Utils\Metadata; +/** + * @todo Use ActionRenderer. + */ class CampaignUrl implements EntryPoint { use NoAuth; - private EntityManager $entityManager; - private LogService $service; - private Hasher $hasher; - private HookManager $hookManager; - private ClientManager $clientManager; - private Metadata $metadata; - public function __construct( - EntityManager $entityManager, - LogService $service, - Hasher $hasher, - HookManager $hookManager, - ClientManager $clientManager, - Metadata $metadata - ) { - $this->entityManager = $entityManager; - $this->service = $service; - $this->hasher = $hasher; - $this->hookManager = $hookManager; - $this->clientManager = $clientManager; - $this->metadata = $metadata; - } + private EntityManager $entityManager, + private LogService $service, + private Hasher $hasher, + private HookManager $hookManager, + private ClientManager $clientManager, + private Metadata $metadata + ) {} /** * @throws BadRequest diff --git a/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php b/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php index 1fede19851..3d76bb7557 100644 --- a/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php +++ b/application/Espo/Modules/Crm/EntryPoints/SubscribeAgain.php @@ -49,32 +49,21 @@ use Espo\Core\Utils\ClientManager; use Espo\Core\Utils\Hasher; use Espo\Core\Utils\Metadata; +/** + * @todo Use ActionRenderer. + */ class SubscribeAgain implements EntryPoint { use NoAuth; - private EntityManager $entityManager; - private ClientManager $clientManager; - private HookManager $hookManager; - private Metadata $metadata; - private Hasher $hasher; - private MassEmailUtil $util; - public function __construct( - EntityManager $entityManager, - ClientManager $clientManager, - HookManager $hookManager, - Metadata $metadata, - Hasher $hasher, - MassEmailUtil $util - ) { - $this->entityManager = $entityManager; - $this->clientManager = $clientManager; - $this->hookManager = $hookManager; - $this->metadata = $metadata; - $this->hasher = $hasher; - $this->util = $util; - } + private EntityManager $entityManager, + private ClientManager $clientManager, + private HookManager $hookManager, + private Metadata $metadata, + private Hasher $hasher, + private MassEmailUtil $util + ) {} /** * @throws BadRequest diff --git a/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php b/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php index 9a5f5d1cb5..34a6fd9739 100644 --- a/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php +++ b/application/Espo/Modules/Crm/EntryPoints/Unsubscribe.php @@ -51,35 +51,22 @@ use Espo\Core\Utils\ClientManager; use Espo\Core\Utils\Hasher; use Espo\Core\Utils\Metadata; +/** + * @todo Use ActionRenderer. + */ class Unsubscribe implements EntryPoint { use NoAuth; - private EntityManager $entityManager; - private ClientManager $clientManager; - private HookManager $hookManager; - private Metadata $metadata; - private Hasher $hasher; - private LogService $service; - private MassEmailUtil $util; - public function __construct( - EntityManager $entityManager, - ClientManager $clientManager, - HookManager $hookManager, - Metadata $metadata, - Hasher $hasher, - LogService $service, - MassEmailUtil $util - ) { - $this->entityManager = $entityManager; - $this->clientManager = $clientManager; - $this->hookManager = $hookManager; - $this->metadata = $metadata; - $this->hasher = $hasher; - $this->service = $service; - $this->util = $util; - } + private EntityManager $entityManager, + private ClientManager $clientManager, + private HookManager $hookManager, + private Metadata $metadata, + private Hasher $hasher, + private LogService $service, + private MassEmailUtil $util + ) {} /** * @throws BadRequest