From 90e435f49542eb9828e1667843b58793f8cfbfc6 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sun, 6 Mar 2022 10:03:59 +0200
Subject: [PATCH] type fixes

---
 application/Espo/Core/AclPortal/Base.php      | 34 +++++++++----------
 .../Espo/Core/Application/Runner/Params.php   |  5 +++
 application/Espo/Core/Di/AclAware.php         |  2 +-
 application/Espo/Core/Di/AclManagerAware.php  |  2 +-
 application/Espo/Core/Di/AclManagerSetter.php |  2 +-
 application/Espo/Core/Di/AclSetter.php        |  2 +-
 .../Espo/Core/Di/ApplicationStateAware.php    |  2 +-
 .../Espo/Core/Di/ApplicationStateSetter.php   |  2 +-
 application/Espo/Core/Di/ConfigAware.php      |  2 +-
 application/Espo/Core/Di/ConfigSetter.php     |  2 +-
 application/Espo/Core/Di/CryptAware.php       |  2 +-
 application/Espo/Core/Di/CryptSetter.php      |  2 +-
 application/Espo/Core/Di/DataCacheAware.php   |  2 +-
 application/Espo/Core/Di/DataCacheSetter.php  |  2 +-
 application/Espo/Core/Di/DataManagerAware.php |  2 +-
 .../Espo/Core/Di/DataManagerSetter.php        |  2 +-
 application/Espo/Core/Di/DateTimeAware.php    |  2 +-
 application/Espo/Core/Di/DateTimeSetter.php   |  2 +-
 .../Espo/Core/Di/DefaultLanguageAware.php     |  2 +-
 .../Espo/Core/Di/DefaultLanguageSetter.php    |  2 +-
 .../Espo/Core/Di/EmailFilterManagerAware.php  |  2 +-
 .../Espo/Core/Di/EmailFilterManagerSetter.php |  2 +-
 application/Espo/Core/Di/EmailSenderAware.php |  2 +-
 .../Espo/Core/Di/EmailSenderSetter.php        |  2 +-
 .../Espo/Core/Di/EntityManagerAware.php       |  2 +-
 .../Espo/Core/Di/EntityManagerSetter.php      |  2 +-
 application/Espo/Core/Di/FieldUtilAware.php   |  2 +-
 application/Espo/Core/Di/FieldUtilSetter.php  |  4 +--
 .../Core/Di/FieldValidationManagerAware.php   |  2 +-
 .../Core/Di/FieldValidationManagerSetter.php  |  2 +-
 application/Espo/Core/Di/FileManagerAware.php |  2 +-
 .../Espo/Core/Di/FileManagerSetter.php        |  2 +-
 .../Espo/Core/Di/FileStorageManagerAware.php  |  2 +-
 .../Espo/Core/Di/FileStorageManagerSetter.php |  2 +-
 application/Espo/Core/Di/HookManagerAware.php |  2 +-
 .../Espo/Core/Di/HookManagerSetter.php        |  2 +-
 .../Espo/Core/Di/HtmlizerFactoryAware.php     |  2 +-
 .../Espo/Core/Di/HtmlizerFactorySetter.php    |  2 +-
 .../Espo/Core/Di/InjectableFactoryAware.php   |  2 +-
 .../Espo/Core/Di/InjectableFactorySetter.php  |  2 +-
 application/Espo/Core/Di/LanguageAware.php    |  2 +-
 application/Espo/Core/Di/LanguageSetter.php   |  2 +-
 application/Espo/Core/Di/LogAware.php         |  2 +-
 application/Espo/Core/Di/LogSetter.php        |  2 +-
 application/Espo/Core/Di/MetadataAware.php    |  2 +-
 application/Espo/Core/Di/NumberAware.php      |  2 +-
 application/Espo/Core/Di/NumberSetter.php     |  2 +-
 application/Espo/Core/Di/PreferencesAware.php |  2 +-
 .../Espo/Core/Di/PreferencesSetter.php        |  2 +-
 .../Core/Di/RecordServiceContainerAware.php   |  2 +-
 .../Core/Di/RecordServiceContainerSetter.php  |  2 +-
 .../Core/Di/SelectBuilderFactoryAware.php     |  2 +-
 .../Core/Di/SelectBuilderFactorySetter.php    |  2 +-
 .../Core/Di/SelectManagerFactoryAware.php     |  2 +-
 .../Core/Di/SelectManagerFactorySetter.php    |  2 +-
 .../Espo/Core/Di/ServiceFactoryAware.php      |  2 +-
 .../Espo/Core/Di/ServiceFactorySetter.php     |  2 +-
 .../Espo/Core/Di/TemplateFileManagerAware.php |  2 +-
 .../Core/Di/TemplateFileManagerSetter.php     |  2 +-
 application/Espo/Core/Di/UserAware.php        |  2 +-
 application/Espo/Core/Di/UserSetter.php       |  2 +-
 .../Espo/Core/Di/WebSocketSubmissionAware.php |  2 +-
 .../Core/Di/WebSocketSubmissionSetter.php     |  2 +-
 .../Espo/Core/Di/WebhookManagerAware.php      |  2 +-
 .../Espo/Core/Di/WebhookManagerSetter.php     |  2 +-
 application/Espo/Services/Record.php          | 16 ---------
 66 files changed, 86 insertions(+), 97 deletions(-)

diff --git a/application/Espo/Core/AclPortal/Base.php b/application/Espo/Core/AclPortal/Base.php
index 8ec19c5ae7..7e410256a3 100644
--- a/application/Espo/Core/AclPortal/Base.php
+++ b/application/Espo/Core/AclPortal/Base.php
@@ -54,21 +54,21 @@ use Espo\Core\{
  */
 class Base implements AccessChecker, Injectable
 {
-    protected $dependencyList = [];
+    protected $dependencyList = []; /** @phpstan-ignore-line */
 
-    protected $dependencies = [];
+    protected $dependencies = []; /** @phpstan-ignore-line */
 
-    protected $injections = [];
+    protected $injections = []; /** @phpstan-ignore-line */
 
-    protected $entityManager;
+    protected $entityManager; /** @phpstan-ignore-line */
 
-    protected $aclManager;
+    protected $aclManager; /** @phpstan-ignore-line */
 
-    protected $config;
+    protected $config; /** @phpstan-ignore-line */
 
-    protected $scopeChecker;
+    protected $scopeChecker; /** @phpstan-ignore-line */
 
-    protected $defaultChecker;
+    protected $defaultChecker; /** @phpstan-ignore-line */
 
     public function __construct(
         EntityManager $entityManager,
@@ -144,17 +144,17 @@ class Base implements AccessChecker, Injectable
         return false;
     }
 
-    public function checkIsOwner(User $user, Entity $entity)
+    public function checkIsOwner(User $user, Entity $entity) /** @phpstan-ignore-line */
     {
         return $this->aclManager->checkOwnershipOwn($user, $entity);
     }
 
-    public function checkInAccount(User $user, Entity $entity)
+    public function checkInAccount(User $user, Entity $entity) /** @phpstan-ignore-line */
     {
         return $this->aclManager->checkOwnershipAccount($user, $entity);
     }
 
-    public function checkIsOwnContact(User $user, Entity $entity)
+    public function checkIsOwnContact(User $user, Entity $entity) /** @phpstan-ignore-line */
     {
         return $this->aclManager->checkOwnershipContact($user, $entity);
     }
@@ -174,33 +174,33 @@ class Base implements AccessChecker, Injectable
         return $this->aclManager;
     }
 
-    public function inject($name, $object)
+    public function inject($name, $object) /** @phpstan-ignore-line */
     {
         $this->injections[$name] = $object;
     }
 
-    protected function init()
+    protected function init() /** @phpstan-ignore-line */
     {
     }
 
-    protected function getInjection($name)
+    protected function getInjection($name) /** @phpstan-ignore-line */
     {
         return $this->injections[$name] ?? $this->$name ?? null;
     }
 
-    protected function addDependencyList(array $list)
+    protected function addDependencyList(array $list) /** @phpstan-ignore-line */
     {
         foreach ($list as $item) {
             $this->addDependency($item);
         }
     }
 
-    protected function addDependency($name)
+    protected function addDependency($name) /** @phpstan-ignore-line */
     {
         $this->dependencyList[] = $name;
     }
 
-    public function getDependencyList()
+    public function getDependencyList() /** @phpstan-ignore-line */
     {
         return array_merge($this->dependencyList, $this->dependencies);
     }
diff --git a/application/Espo/Core/Application/Runner/Params.php b/application/Espo/Core/Application/Runner/Params.php
index 03ab893940..a46dced5ca 100644
--- a/application/Espo/Core/Application/Runner/Params.php
+++ b/application/Espo/Core/Application/Runner/Params.php
@@ -34,6 +34,9 @@ namespace Espo\Core\Application\Runner;
  */
 class Params
 {
+    /**
+     * @var array<string,mixed>
+     */
     private $data = [];
 
     public function __construct()
@@ -74,6 +77,8 @@ class Params
 
     /**
      * Create from an associative array.
+     *
+     * @param array<string,mixed> $data
      */
     public static function fromArray(array $data): self
     {
diff --git a/application/Espo/Core/Di/AclAware.php b/application/Espo/Core/Di/AclAware.php
index 530ec6e2ba..c982fb3f02 100644
--- a/application/Espo/Core/Di/AclAware.php
+++ b/application/Espo/Core/Di/AclAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Acl;
 
 interface AclAware
 {
-    public function setAcl(Acl $acl);
+    public function setAcl(Acl $acl): void;
 }
diff --git a/application/Espo/Core/Di/AclManagerAware.php b/application/Espo/Core/Di/AclManagerAware.php
index 2e9e3faa4e..d25669ad01 100644
--- a/application/Espo/Core/Di/AclManagerAware.php
+++ b/application/Espo/Core/Di/AclManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\AclManager;
 
 interface AclManagerAware
 {
-    public function setAclManager(AclManager $aclManager);
+    public function setAclManager(AclManager $aclManager): void;
 }
diff --git a/application/Espo/Core/Di/AclManagerSetter.php b/application/Espo/Core/Di/AclManagerSetter.php
index e340c78256..c6e8e82c3e 100644
--- a/application/Espo/Core/Di/AclManagerSetter.php
+++ b/application/Espo/Core/Di/AclManagerSetter.php
@@ -38,7 +38,7 @@ trait AclManagerSetter
      */
     protected $aclManager;
 
-    public function setAclManager(AclManager $aclManager)
+    public function setAclManager(AclManager $aclManager): void
     {
         $this->aclManager = $aclManager;
     }
diff --git a/application/Espo/Core/Di/AclSetter.php b/application/Espo/Core/Di/AclSetter.php
index ee16572394..ef83ddd56b 100644
--- a/application/Espo/Core/Di/AclSetter.php
+++ b/application/Espo/Core/Di/AclSetter.php
@@ -38,7 +38,7 @@ trait AclSetter
      */
     protected $acl;
 
-    public function setAcl(Acl $acl)
+    public function setAcl(Acl $acl): void
     {
         $this->acl = $acl;
     }
diff --git a/application/Espo/Core/Di/ApplicationStateAware.php b/application/Espo/Core/Di/ApplicationStateAware.php
index b18d8de530..3781b611f9 100644
--- a/application/Espo/Core/Di/ApplicationStateAware.php
+++ b/application/Espo/Core/Di/ApplicationStateAware.php
@@ -33,5 +33,5 @@ use Espo\Core\ApplicationState;
 
 interface ApplicationStateAware
 {
-    public function setApplicationState(ApplicationState $applicationState);
+    public function setApplicationState(ApplicationState $applicationState): void;
 }
diff --git a/application/Espo/Core/Di/ApplicationStateSetter.php b/application/Espo/Core/Di/ApplicationStateSetter.php
index b8c5300fa9..539eb720c5 100644
--- a/application/Espo/Core/Di/ApplicationStateSetter.php
+++ b/application/Espo/Core/Di/ApplicationStateSetter.php
@@ -38,7 +38,7 @@ trait ApplicationStateSetter
      */
     protected $applicationState;
 
-    public function setApplicationState(ApplicationState $applicationState)
+    public function setApplicationState(ApplicationState $applicationState): void
     {
         $this->applicationState = $applicationState;
     }
diff --git a/application/Espo/Core/Di/ConfigAware.php b/application/Espo/Core/Di/ConfigAware.php
index d009ead2d8..a0324bdd88 100644
--- a/application/Espo/Core/Di/ConfigAware.php
+++ b/application/Espo/Core/Di/ConfigAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Config;
 
 interface ConfigAware
 {
-    public function setConfig(Config $config);
+    public function setConfig(Config $config): void;
 }
diff --git a/application/Espo/Core/Di/ConfigSetter.php b/application/Espo/Core/Di/ConfigSetter.php
index 799265a61b..43208c06b9 100644
--- a/application/Espo/Core/Di/ConfigSetter.php
+++ b/application/Espo/Core/Di/ConfigSetter.php
@@ -38,7 +38,7 @@ trait ConfigSetter
      */
     protected $config;
 
-    public function setConfig(Config $config)
+    public function setConfig(Config $config): void
     {
         $this->config = $config;
     }
diff --git a/application/Espo/Core/Di/CryptAware.php b/application/Espo/Core/Di/CryptAware.php
index 3740841824..43e801b902 100644
--- a/application/Espo/Core/Di/CryptAware.php
+++ b/application/Espo/Core/Di/CryptAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Crypt;
 
 interface CryptAware
 {
-    public function setCrypt(Crypt $crypt);
+    public function setCrypt(Crypt $crypt): void;
 }
diff --git a/application/Espo/Core/Di/CryptSetter.php b/application/Espo/Core/Di/CryptSetter.php
index 2739d5951f..ec9934c631 100644
--- a/application/Espo/Core/Di/CryptSetter.php
+++ b/application/Espo/Core/Di/CryptSetter.php
@@ -38,7 +38,7 @@ trait CryptSetter
      */
     protected $crypt;
 
-    public function setCrypt(Crypt $crypt)
+    public function setCrypt(Crypt $crypt): void
     {
         $this->crypt = $crypt;
     }
diff --git a/application/Espo/Core/Di/DataCacheAware.php b/application/Espo/Core/Di/DataCacheAware.php
index 024905d4d2..f80e10af4b 100644
--- a/application/Espo/Core/Di/DataCacheAware.php
+++ b/application/Espo/Core/Di/DataCacheAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\DataCache;
 
 interface DataCacheAware
 {
-    public function setDataCache(DataCache $dataCache);
+    public function setDataCache(DataCache $dataCache): void;
 }
diff --git a/application/Espo/Core/Di/DataCacheSetter.php b/application/Espo/Core/Di/DataCacheSetter.php
index 2e4b729750..bce8c2d5fe 100644
--- a/application/Espo/Core/Di/DataCacheSetter.php
+++ b/application/Espo/Core/Di/DataCacheSetter.php
@@ -38,7 +38,7 @@ trait DataCacheSetter
      */
     protected $dataCache;
 
-    public function setDataCache(DataCache $dataCache)
+    public function setDataCache(DataCache $dataCache): void
     {
         $this->dataCache = $dataCache;
     }
diff --git a/application/Espo/Core/Di/DataManagerAware.php b/application/Espo/Core/Di/DataManagerAware.php
index 6327c5947d..5371ff2621 100644
--- a/application/Espo/Core/Di/DataManagerAware.php
+++ b/application/Espo/Core/Di/DataManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\DataManager;
 
 interface DataManagerAware
 {
-    public function setDataManager(DataManager $dataManager);
+    public function setDataManager(DataManager $dataManager): void;
 }
diff --git a/application/Espo/Core/Di/DataManagerSetter.php b/application/Espo/Core/Di/DataManagerSetter.php
index 6413876348..10ce2ca376 100644
--- a/application/Espo/Core/Di/DataManagerSetter.php
+++ b/application/Espo/Core/Di/DataManagerSetter.php
@@ -38,7 +38,7 @@ trait DataManagerSetter
      */
     protected $dataManager;
 
-    public function setDataManager(DataManager $dataManager)
+    public function setDataManager(DataManager $dataManager): void
     {
         $this->dataManager = $dataManager;
     }
diff --git a/application/Espo/Core/Di/DateTimeAware.php b/application/Espo/Core/Di/DateTimeAware.php
index 7b957ce9d5..d447001b8e 100644
--- a/application/Espo/Core/Di/DateTimeAware.php
+++ b/application/Espo/Core/Di/DateTimeAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\DateTime;
 
 interface DateTimeAware
 {
-    public function setDateTime(DateTime $dateTime);
+    public function setDateTime(DateTime $dateTime): void;
 }
diff --git a/application/Espo/Core/Di/DateTimeSetter.php b/application/Espo/Core/Di/DateTimeSetter.php
index e294bcb99b..980aab23b6 100644
--- a/application/Espo/Core/Di/DateTimeSetter.php
+++ b/application/Espo/Core/Di/DateTimeSetter.php
@@ -38,7 +38,7 @@ trait DateTimeSetter
      */
     protected $dateTime;
 
-    public function setDateTime(DateTime $dateTime)
+    public function setDateTime(DateTime $dateTime): void
     {
         $this->dateTime = $dateTime;
     }
diff --git a/application/Espo/Core/Di/DefaultLanguageAware.php b/application/Espo/Core/Di/DefaultLanguageAware.php
index 24c79d2783..3c78f021a9 100644
--- a/application/Espo/Core/Di/DefaultLanguageAware.php
+++ b/application/Espo/Core/Di/DefaultLanguageAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Language;
 
 interface DefaultLanguageAware
 {
-    public function setDefaultLanguage(Language $defaultLanguage);
+    public function setDefaultLanguage(Language $defaultLanguage): void;
 }
diff --git a/application/Espo/Core/Di/DefaultLanguageSetter.php b/application/Espo/Core/Di/DefaultLanguageSetter.php
index c69e560570..02a0e8973e 100644
--- a/application/Espo/Core/Di/DefaultLanguageSetter.php
+++ b/application/Espo/Core/Di/DefaultLanguageSetter.php
@@ -38,7 +38,7 @@ trait DefaultLanguageSetter
      */
     protected $defaultLanguage;
 
-    public function setDefaultLanguage(Language $defaultLanguage)
+    public function setDefaultLanguage(Language $defaultLanguage): void
     {
         $this->defaultLanguage = $defaultLanguage;
     }
diff --git a/application/Espo/Core/Di/EmailFilterManagerAware.php b/application/Espo/Core/Di/EmailFilterManagerAware.php
index 03ee063f41..4f1ce710b1 100644
--- a/application/Espo/Core/Di/EmailFilterManagerAware.php
+++ b/application/Espo/Core/Di/EmailFilterManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\EmailFilterManager;
 
 interface EmailFilterManagerAware
 {
-    public function setEmailFilterManager(EmailFilterManager $emailFilterManager);
+    public function setEmailFilterManager(EmailFilterManager $emailFilterManager): void;
 }
diff --git a/application/Espo/Core/Di/EmailFilterManagerSetter.php b/application/Espo/Core/Di/EmailFilterManagerSetter.php
index dfca4a20a3..f6e717d675 100644
--- a/application/Espo/Core/Di/EmailFilterManagerSetter.php
+++ b/application/Espo/Core/Di/EmailFilterManagerSetter.php
@@ -38,7 +38,7 @@ trait EmailFilterManagerSetter
      */
     protected $emailFilterManager;
 
-    public function setEmailFilterManager(EmailFilterManager $emailFilterManager)
+    public function setEmailFilterManager(EmailFilterManager $emailFilterManager): void
     {
         $this->emailFilterManager = $emailFilterManager;
     }
diff --git a/application/Espo/Core/Di/EmailSenderAware.php b/application/Espo/Core/Di/EmailSenderAware.php
index 79f4e2df2d..f3ff1f3067 100644
--- a/application/Espo/Core/Di/EmailSenderAware.php
+++ b/application/Espo/Core/Di/EmailSenderAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Mail\EmailSender as EmailSender;
 
 interface EmailSenderAware
 {
-    public function setEmailSender(EmailSender $emailSender);
+    public function setEmailSender(EmailSender $emailSender): void;
 }
diff --git a/application/Espo/Core/Di/EmailSenderSetter.php b/application/Espo/Core/Di/EmailSenderSetter.php
index ae0ce6bf47..12a40a4574 100644
--- a/application/Espo/Core/Di/EmailSenderSetter.php
+++ b/application/Espo/Core/Di/EmailSenderSetter.php
@@ -38,7 +38,7 @@ trait EmailSenderSetter
      */
     protected $emailSender;
 
-    public function setEmailSender(EmailSender $emailSender)
+    public function setEmailSender(EmailSender $emailSender): void
     {
         $this->emailSender = $emailSender;
     }
diff --git a/application/Espo/Core/Di/EntityManagerAware.php b/application/Espo/Core/Di/EntityManagerAware.php
index 6e18dbffa4..25a6f27174 100644
--- a/application/Espo/Core/Di/EntityManagerAware.php
+++ b/application/Espo/Core/Di/EntityManagerAware.php
@@ -33,5 +33,5 @@ use Espo\ORM\EntityManager;
 
 interface EntityManagerAware
 {
-    public function setEntityManager(EntityManager $entityManager);
+    public function setEntityManager(EntityManager $entityManager): void;
 }
diff --git a/application/Espo/Core/Di/EntityManagerSetter.php b/application/Espo/Core/Di/EntityManagerSetter.php
index 26cb227267..60d8c684cc 100644
--- a/application/Espo/Core/Di/EntityManagerSetter.php
+++ b/application/Espo/Core/Di/EntityManagerSetter.php
@@ -38,7 +38,7 @@ trait EntityManagerSetter
      */
     protected $entityManager;
 
-    public function setEntityManager(EntityManager $entityManager)
+    public function setEntityManager(EntityManager $entityManager): void
     {
         $this->entityManager = $entityManager;
     }
diff --git a/application/Espo/Core/Di/FieldUtilAware.php b/application/Espo/Core/Di/FieldUtilAware.php
index a66eaef9f7..5a65f07731 100644
--- a/application/Espo/Core/Di/FieldUtilAware.php
+++ b/application/Espo/Core/Di/FieldUtilAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\FieldUtil;
 
 interface FieldUtilAware
 {
-    public function setFieldUtil(FieldUtil $fieldUtil);
+    public function setFieldUtil(FieldUtil $fieldUtil): void;
 }
diff --git a/application/Espo/Core/Di/FieldUtilSetter.php b/application/Espo/Core/Di/FieldUtilSetter.php
index 3a182c0c6f..beab1f8d58 100644
--- a/application/Espo/Core/Di/FieldUtilSetter.php
+++ b/application/Espo/Core/Di/FieldUtilSetter.php
@@ -40,12 +40,12 @@ trait FieldUtilSetter
 
     protected $fieldManagerUtil;
 
-    public function setFieldUtil(FieldUtil $fieldUtil)
+    public function setFieldUtil(FieldUtil $fieldUtil): void
     {
         $this->fieldUtil = $fieldUtil;
 
         // for backward compatibility
-        // @todo Remove in 6.4.
+        // @todo Remove.
         $this->fieldManagerUtil = $fieldUtil;
     }
 }
diff --git a/application/Espo/Core/Di/FieldValidationManagerAware.php b/application/Espo/Core/Di/FieldValidationManagerAware.php
index 4e9db0dbb6..bafdb3720f 100644
--- a/application/Espo/Core/Di/FieldValidationManagerAware.php
+++ b/application/Espo/Core/Di/FieldValidationManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\FieldValidation\FieldValidationManager;
 
 interface FieldValidationManagerAware
 {
-    public function setFieldValidationManager(FieldValidationManager $fieldValidationManager);
+    public function setFieldValidationManager(FieldValidationManager $fieldValidationManager): void;
 }
diff --git a/application/Espo/Core/Di/FieldValidationManagerSetter.php b/application/Espo/Core/Di/FieldValidationManagerSetter.php
index 3bcbae472f..6f56a44a39 100644
--- a/application/Espo/Core/Di/FieldValidationManagerSetter.php
+++ b/application/Espo/Core/Di/FieldValidationManagerSetter.php
@@ -38,7 +38,7 @@ trait FieldValidationManagerSetter
      */
     protected $fieldValidationManager;
 
-    public function setFieldValidationManager(FieldValidationManager $fieldValidationManager)
+    public function setFieldValidationManager(FieldValidationManager $fieldValidationManager): void
     {
         $this->fieldValidationManager = $fieldValidationManager;
     }
diff --git a/application/Espo/Core/Di/FileManagerAware.php b/application/Espo/Core/Di/FileManagerAware.php
index 5242d66af9..fa19adfe77 100644
--- a/application/Espo/Core/Di/FileManagerAware.php
+++ b/application/Espo/Core/Di/FileManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\File\Manager as FileManager;
 
 interface FileManagerAware
 {
-    public function setFileManager(FileManager $fileManager);
+    public function setFileManager(FileManager $fileManager): void;
 }
diff --git a/application/Espo/Core/Di/FileManagerSetter.php b/application/Espo/Core/Di/FileManagerSetter.php
index ca8f1ab298..e402ae4819 100644
--- a/application/Espo/Core/Di/FileManagerSetter.php
+++ b/application/Espo/Core/Di/FileManagerSetter.php
@@ -38,7 +38,7 @@ trait FileManagerSetter
      */
     protected $fileManager;
 
-    public function setFileManager(FileManager $fileManager)
+    public function setFileManager(FileManager $fileManager): void
     {
         $this->fileManager = $fileManager;
     }
diff --git a/application/Espo/Core/Di/FileStorageManagerAware.php b/application/Espo/Core/Di/FileStorageManagerAware.php
index bb92534434..073e2c2cc7 100644
--- a/application/Espo/Core/Di/FileStorageManagerAware.php
+++ b/application/Espo/Core/Di/FileStorageManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\FileStorage\Manager as FileStorageManager;
 
 interface FileStorageManagerAware
 {
-    public function setFileStorageManager(FileStorageManager $fileStorageManager);
+    public function setFileStorageManager(FileStorageManager $fileStorageManager): void;
 }
diff --git a/application/Espo/Core/Di/FileStorageManagerSetter.php b/application/Espo/Core/Di/FileStorageManagerSetter.php
index 1ae39d2dff..44c4c61464 100644
--- a/application/Espo/Core/Di/FileStorageManagerSetter.php
+++ b/application/Espo/Core/Di/FileStorageManagerSetter.php
@@ -38,7 +38,7 @@ trait FileStorageManagerSetter
      */
     protected $fileStorageManager;
 
-    public function setFileStorageManager(FileStorageManager $fileStorageManager)
+    public function setFileStorageManager(FileStorageManager $fileStorageManager): void
     {
         $this->fileStorageManager = $fileStorageManager;
     }
diff --git a/application/Espo/Core/Di/HookManagerAware.php b/application/Espo/Core/Di/HookManagerAware.php
index 765588326b..f6ff9b316d 100644
--- a/application/Espo/Core/Di/HookManagerAware.php
+++ b/application/Espo/Core/Di/HookManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\HookManager;
 
 interface HookManagerAware
 {
-    public function setHookManager(HookManager $hookManager);
+    public function setHookManager(HookManager $hookManager): void;
 }
diff --git a/application/Espo/Core/Di/HookManagerSetter.php b/application/Espo/Core/Di/HookManagerSetter.php
index 685f672d93..eab8828d0d 100644
--- a/application/Espo/Core/Di/HookManagerSetter.php
+++ b/application/Espo/Core/Di/HookManagerSetter.php
@@ -38,7 +38,7 @@ trait HookManagerSetter
      */
     protected $hookManager;
 
-    public function setHookManager(HookManager $hookManager)
+    public function setHookManager(HookManager $hookManager): void
     {
         $this->hookManager = $hookManager;
     }
diff --git a/application/Espo/Core/Di/HtmlizerFactoryAware.php b/application/Espo/Core/Di/HtmlizerFactoryAware.php
index 101f6dcaf2..3e0b7bef76 100644
--- a/application/Espo/Core/Di/HtmlizerFactoryAware.php
+++ b/application/Espo/Core/Di/HtmlizerFactoryAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Htmlizer\HtmlizerFactory as HtmlizerFactory;
 
 interface HtmlizerFactoryAware
 {
-    public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory);
+    public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory): void;
 }
diff --git a/application/Espo/Core/Di/HtmlizerFactorySetter.php b/application/Espo/Core/Di/HtmlizerFactorySetter.php
index 085eca68eb..8d41e28aea 100644
--- a/application/Espo/Core/Di/HtmlizerFactorySetter.php
+++ b/application/Espo/Core/Di/HtmlizerFactorySetter.php
@@ -38,7 +38,7 @@ trait HtmlizerFactorySetter
      */
     protected $htmlizerFactory;
 
-    public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory)
+    public function setHtmlizerFactory(HtmlizerFactory $htmlizerFactory): void
     {
         $this->htmlizerFactory = $htmlizerFactory;
     }
diff --git a/application/Espo/Core/Di/InjectableFactoryAware.php b/application/Espo/Core/Di/InjectableFactoryAware.php
index a3867a9ee4..e566e8fba2 100644
--- a/application/Espo/Core/Di/InjectableFactoryAware.php
+++ b/application/Espo/Core/Di/InjectableFactoryAware.php
@@ -33,5 +33,5 @@ use Espo\Core\InjectableFactory;
 
 interface InjectableFactoryAware
 {
-    public function setInjectableFactory(InjectableFactory $injectableFactory);
+    public function setInjectableFactory(InjectableFactory $injectableFactory): void;
 }
diff --git a/application/Espo/Core/Di/InjectableFactorySetter.php b/application/Espo/Core/Di/InjectableFactorySetter.php
index 1f84ee687d..32320468d5 100644
--- a/application/Espo/Core/Di/InjectableFactorySetter.php
+++ b/application/Espo/Core/Di/InjectableFactorySetter.php
@@ -38,7 +38,7 @@ trait InjectableFactorySetter
      */
     protected $injectableFactory;
 
-    public function setInjectableFactory(InjectableFactory $injectableFactory)
+    public function setInjectableFactory(InjectableFactory $injectableFactory): void
     {
         $this->injectableFactory = $injectableFactory;
     }
diff --git a/application/Espo/Core/Di/LanguageAware.php b/application/Espo/Core/Di/LanguageAware.php
index 3231f686bc..8ea005b57d 100644
--- a/application/Espo/Core/Di/LanguageAware.php
+++ b/application/Espo/Core/Di/LanguageAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Language;
 
 interface LanguageAware
 {
-    public function setLanguage(Language $language);
+    public function setLanguage(Language $language): void;
 }
diff --git a/application/Espo/Core/Di/LanguageSetter.php b/application/Espo/Core/Di/LanguageSetter.php
index a1c327e787..5edd1c620c 100644
--- a/application/Espo/Core/Di/LanguageSetter.php
+++ b/application/Espo/Core/Di/LanguageSetter.php
@@ -38,7 +38,7 @@ trait LanguageSetter
      */
     protected $language;
 
-    public function setLanguage(Language $language)
+    public function setLanguage(Language $language): void
     {
         $this->language = $language;
     }
diff --git a/application/Espo/Core/Di/LogAware.php b/application/Espo/Core/Di/LogAware.php
index c177afb625..f33194c725 100644
--- a/application/Espo/Core/Di/LogAware.php
+++ b/application/Espo/Core/Di/LogAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Log;
 
 interface LogAware
 {
-    public function setLog(Log $log);
+    public function setLog(Log $log): void;
 }
diff --git a/application/Espo/Core/Di/LogSetter.php b/application/Espo/Core/Di/LogSetter.php
index 99eda0ad3d..aef57e8420 100644
--- a/application/Espo/Core/Di/LogSetter.php
+++ b/application/Espo/Core/Di/LogSetter.php
@@ -38,7 +38,7 @@ trait LogSetter
      */
     protected $log;
 
-    public function setLog(Log $log)
+    public function setLog(Log $log): void
     {
         $this->log = $log;
     }
diff --git a/application/Espo/Core/Di/MetadataAware.php b/application/Espo/Core/Di/MetadataAware.php
index 9138f245e2..6888ded44a 100644
--- a/application/Espo/Core/Di/MetadataAware.php
+++ b/application/Espo/Core/Di/MetadataAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\Metadata;
 
 interface MetadataAware
 {
-    public function setMetadata(Metadata $metadata);
+    public function setMetadata(Metadata $metadata): void;
 }
diff --git a/application/Espo/Core/Di/NumberAware.php b/application/Espo/Core/Di/NumberAware.php
index 5529fbd9b9..c680128478 100644
--- a/application/Espo/Core/Di/NumberAware.php
+++ b/application/Espo/Core/Di/NumberAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\NumberUtil;
 
 interface NumberAware
 {
-    public function setNumber(NumberUtil $number);
+    public function setNumber(NumberUtil $number): void;
 }
diff --git a/application/Espo/Core/Di/NumberSetter.php b/application/Espo/Core/Di/NumberSetter.php
index a094993415..013103d300 100644
--- a/application/Espo/Core/Di/NumberSetter.php
+++ b/application/Espo/Core/Di/NumberSetter.php
@@ -38,7 +38,7 @@ trait NumberSetter
      */
     protected $number;
 
-    public function setNumber(NumberUtil $number)
+    public function setNumber(NumberUtil $number): void
     {
         $this->number = $number;
     }
diff --git a/application/Espo/Core/Di/PreferencesAware.php b/application/Espo/Core/Di/PreferencesAware.php
index 28367d5fbb..2330d3186a 100644
--- a/application/Espo/Core/Di/PreferencesAware.php
+++ b/application/Espo/Core/Di/PreferencesAware.php
@@ -33,5 +33,5 @@ use Espo\Entities\Preferences;
 
 interface PreferencesAware
 {
-    public function setPreferences(Preferences $preferences);
+    public function setPreferences(Preferences $preferences): void;
 }
diff --git a/application/Espo/Core/Di/PreferencesSetter.php b/application/Espo/Core/Di/PreferencesSetter.php
index 05d758a2a2..98f6647e98 100644
--- a/application/Espo/Core/Di/PreferencesSetter.php
+++ b/application/Espo/Core/Di/PreferencesSetter.php
@@ -38,7 +38,7 @@ trait PreferencesSetter
      */
     protected $preferences;
 
-    public function setPreferences(Preferences $preferences)
+    public function setPreferences(Preferences $preferences): void
     {
         $this->preferences = $preferences;
     }
diff --git a/application/Espo/Core/Di/RecordServiceContainerAware.php b/application/Espo/Core/Di/RecordServiceContainerAware.php
index 3ac1bf5cdd..f379cdbcbb 100644
--- a/application/Espo/Core/Di/RecordServiceContainerAware.php
+++ b/application/Espo/Core/Di/RecordServiceContainerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Record\ServiceContainer as RecordServiceContainer;
 
 interface RecordServiceContainerAware
 {
-    public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer);
+    public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer): void;
 }
diff --git a/application/Espo/Core/Di/RecordServiceContainerSetter.php b/application/Espo/Core/Di/RecordServiceContainerSetter.php
index 82c28f2db0..0ed5701dd3 100644
--- a/application/Espo/Core/Di/RecordServiceContainerSetter.php
+++ b/application/Espo/Core/Di/RecordServiceContainerSetter.php
@@ -38,7 +38,7 @@ trait RecordServiceContainerSetter
      */
     protected $recordServiceContainer;
 
-    public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer)
+    public function setRecordServiceContainer(RecordServiceContainer $recordServiceContainer): void
     {
         $this->recordServiceContainer = $recordServiceContainer;
     }
diff --git a/application/Espo/Core/Di/SelectBuilderFactoryAware.php b/application/Espo/Core/Di/SelectBuilderFactoryAware.php
index e968ae92bd..bf864ab9d8 100644
--- a/application/Espo/Core/Di/SelectBuilderFactoryAware.php
+++ b/application/Espo/Core/Di/SelectBuilderFactoryAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Select\SelectBuilderFactory;
 
 interface SelectBuilderFactoryAware
 {
-    public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory);
+    public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory): void;
 }
diff --git a/application/Espo/Core/Di/SelectBuilderFactorySetter.php b/application/Espo/Core/Di/SelectBuilderFactorySetter.php
index 1c18bced16..40e31a9c39 100644
--- a/application/Espo/Core/Di/SelectBuilderFactorySetter.php
+++ b/application/Espo/Core/Di/SelectBuilderFactorySetter.php
@@ -38,7 +38,7 @@ trait SelectBuilderFactorySetter
      */
     protected $selectBuilderFactory;
 
-    public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory)
+    public function setSelectBuilderFactory(SelectBuilderFactory $selectBuilderFactory): void
     {
         $this->selectBuilderFactory = $selectBuilderFactory;
     }
diff --git a/application/Espo/Core/Di/SelectManagerFactoryAware.php b/application/Espo/Core/Di/SelectManagerFactoryAware.php
index 202dae69d0..c13e28ce21 100644
--- a/application/Espo/Core/Di/SelectManagerFactoryAware.php
+++ b/application/Espo/Core/Di/SelectManagerFactoryAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Select\SelectManagerFactory;
 
 interface SelectManagerFactoryAware
 {
-    public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory);
+    public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory): void;
 }
diff --git a/application/Espo/Core/Di/SelectManagerFactorySetter.php b/application/Espo/Core/Di/SelectManagerFactorySetter.php
index 490bb437ab..c7f68b0e95 100644
--- a/application/Espo/Core/Di/SelectManagerFactorySetter.php
+++ b/application/Espo/Core/Di/SelectManagerFactorySetter.php
@@ -35,7 +35,7 @@ trait SelectManagerFactorySetter
 {
     protected $selectManagerFactory;
 
-    public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory)
+    public function setSelectManagerFactory(SelectManagerFactory $selectManagerFactory): void
     {
         $this->selectManagerFactory = $selectManagerFactory;
     }
diff --git a/application/Espo/Core/Di/ServiceFactoryAware.php b/application/Espo/Core/Di/ServiceFactoryAware.php
index 3abe04ac68..bbd2223613 100644
--- a/application/Espo/Core/Di/ServiceFactoryAware.php
+++ b/application/Espo/Core/Di/ServiceFactoryAware.php
@@ -33,5 +33,5 @@ use Espo\Core\ServiceFactory;
 
 interface ServiceFactoryAware
 {
-    public function setServiceFactory(ServiceFactory $serviceFactory);
+    public function setServiceFactory(ServiceFactory $serviceFactory): void;
 }
diff --git a/application/Espo/Core/Di/ServiceFactorySetter.php b/application/Espo/Core/Di/ServiceFactorySetter.php
index df089bf013..f1fdbaf07d 100644
--- a/application/Espo/Core/Di/ServiceFactorySetter.php
+++ b/application/Espo/Core/Di/ServiceFactorySetter.php
@@ -38,7 +38,7 @@ trait ServiceFactorySetter
      */
     protected $serviceFactory;
 
-    public function setServiceFactory(ServiceFactory $serviceFactory)
+    public function setServiceFactory(ServiceFactory $serviceFactory): void
     {
         $this->serviceFactory = $serviceFactory;
     }
diff --git a/application/Espo/Core/Di/TemplateFileManagerAware.php b/application/Espo/Core/Di/TemplateFileManagerAware.php
index d4066b9007..fb46c7dda6 100644
--- a/application/Espo/Core/Di/TemplateFileManagerAware.php
+++ b/application/Espo/Core/Di/TemplateFileManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Utils\TemplateFileManager;
 
 interface TemplateFileManagerAware
 {
-    public function setTemplateFileManager(TemplateFileManager $templateFileManager);
+    public function setTemplateFileManager(TemplateFileManager $templateFileManager): void;
 }
diff --git a/application/Espo/Core/Di/TemplateFileManagerSetter.php b/application/Espo/Core/Di/TemplateFileManagerSetter.php
index c3da4917c5..f11a50c9dc 100644
--- a/application/Espo/Core/Di/TemplateFileManagerSetter.php
+++ b/application/Espo/Core/Di/TemplateFileManagerSetter.php
@@ -38,7 +38,7 @@ trait TemplateFileManagerSetter
      */
     protected $templateFileManager;
 
-    public function setTemplateFileManager(TemplateFileManager $templateFileManager)
+    public function setTemplateFileManager(TemplateFileManager $templateFileManager): void
     {
         $this->templateFileManager = $templateFileManager;
     }
diff --git a/application/Espo/Core/Di/UserAware.php b/application/Espo/Core/Di/UserAware.php
index 3a3c0e4f39..fad53cb95f 100644
--- a/application/Espo/Core/Di/UserAware.php
+++ b/application/Espo/Core/Di/UserAware.php
@@ -33,5 +33,5 @@ use Espo\Entities\User;
 
 interface UserAware
 {
-    public function setUser(User $user);
+    public function setUser(User $user): void;
 }
diff --git a/application/Espo/Core/Di/UserSetter.php b/application/Espo/Core/Di/UserSetter.php
index 58dbb01787..17aa735e08 100644
--- a/application/Espo/Core/Di/UserSetter.php
+++ b/application/Espo/Core/Di/UserSetter.php
@@ -38,7 +38,7 @@ trait UserSetter
      */
     protected $user;
 
-    public function setUser(User $user)
+    public function setUser(User $user): void
     {
         $this->user = $user;
     }
diff --git a/application/Espo/Core/Di/WebSocketSubmissionAware.php b/application/Espo/Core/Di/WebSocketSubmissionAware.php
index 6ffee56d4b..7caa194ae4 100644
--- a/application/Espo/Core/Di/WebSocketSubmissionAware.php
+++ b/application/Espo/Core/Di/WebSocketSubmissionAware.php
@@ -33,5 +33,5 @@ use Espo\Core\WebSocket\Submission;
 
 interface WebSocketSubmissionAware
 {
-    public function setWebSocketSubmission(Submission $webSocketSubmission);
+    public function setWebSocketSubmission(Submission $webSocketSubmission): void;
 }
diff --git a/application/Espo/Core/Di/WebSocketSubmissionSetter.php b/application/Espo/Core/Di/WebSocketSubmissionSetter.php
index b0bd914221..79349b69d7 100644
--- a/application/Espo/Core/Di/WebSocketSubmissionSetter.php
+++ b/application/Espo/Core/Di/WebSocketSubmissionSetter.php
@@ -38,7 +38,7 @@ trait WebSocketSubmissionSetter
      */
     protected $webSocketSubmission;
 
-    public function setWebSocketSubmission(Submission $webSocketSubmission)
+    public function setWebSocketSubmission(Submission $webSocketSubmission): void
     {
         $this->webSocketSubmission = $webSocketSubmission;
     }
diff --git a/application/Espo/Core/Di/WebhookManagerAware.php b/application/Espo/Core/Di/WebhookManagerAware.php
index 789a0dd962..b8e0ea24d8 100644
--- a/application/Espo/Core/Di/WebhookManagerAware.php
+++ b/application/Espo/Core/Di/WebhookManagerAware.php
@@ -33,5 +33,5 @@ use Espo\Core\Webhook\Manager;
 
 interface WebhookManagerAware
 {
-    public function setWebhookManager(Manager $webhookManager);
+    public function setWebhookManager(Manager $webhookManager): void;
 }
diff --git a/application/Espo/Core/Di/WebhookManagerSetter.php b/application/Espo/Core/Di/WebhookManagerSetter.php
index c654cd7920..be2aa438d6 100644
--- a/application/Espo/Core/Di/WebhookManagerSetter.php
+++ b/application/Espo/Core/Di/WebhookManagerSetter.php
@@ -38,7 +38,7 @@ trait WebhookManagerSetter
      */
     protected $webhookManager;
 
-    public function setWebhookManager(Manager $webhookManager)
+    public function setWebhookManager(Manager $webhookManager): void
     {
         $this->webhookManager = $webhookManager;
     }
diff --git a/application/Espo/Services/Record.php b/application/Espo/Services/Record.php
index a7e2946cd6..971d25e03c 100644
--- a/application/Espo/Services/Record.php
+++ b/application/Espo/Services/Record.php
@@ -115,22 +115,6 @@ class Record extends RecordService implements
     {
     }
 
-    /**
-     * @todo Remove.
-     */
-    public function setAcl(Acl $acl)
-    {
-        $this->acl = $acl;
-    }
-
-    /**
-     * @todo Remove.
-     */
-    public function setUser(User $user)
-    {
-        $this->user = $user;
-    }
-
     /**
      * @deprecated Use `$this->entityType`.
      */