Skip to content

EspoCRM – Open Source CRM Application

Use qualifier

Yuriib7e6e033a893
diff --git a/application/Espo/Binding.php b/application/Espo/Binding.php
index e307a18b40..69417feb1a 100644
--- a/application/Espo/Binding.php
+++ b/application/Espo/Binding.php
@@ -32,6 +32,7 @@ namespace Espo;
use Espo\Core\Binding\Binder;
use Espo\Core\Binding\BindingProcessor;
use Espo\Core\Binding\Key\NamedClassKey;
+use Espo\Core\Binding\Key\QualifiedClassKey;
/**
* Default binding for the dependency injection framework. Custom binding should be set up in
@@ -178,16 +179,31 @@ class Binding implements BindingProcessor
'baseLanguage'
);
+ $binder->bindService(
+ QualifiedClassKey::create('Espo\\Core\\Utils\\Language', 'base'),
+ 'baseLanguage'
+ );
+
$binder->bindService(
NamedClassKey::create('Espo\\Core\\Utils\\Language', 'defaultLanguage'),
'defaultLanguage'
);
+ $binder->bindService(
+ QualifiedClassKey::create('Espo\\Core\\Utils\\Language', 'default'),
+ 'defaultLanguage'
+ );
+
$binder->bindService(
'Espo\\Core\\Utils\\Language',
'language'
);
+ $binder->bindService(
+ QualifiedClassKey::create('Espo\\Core\\Utils\\Language', 'user'),
+ 'language'
+ );
+
$binder->bindService(
'Espo\\Core\\Formula\\Manager',
'formulaManager'
diff --git a/application/Espo/Classes/FieldProcessing/CurrencyRecord/Label.php b/application/Espo/Classes/FieldProcessing/CurrencyRecord/Label.php
index cec42b951f..68e23dcd31 100644
--- a/application/Espo/Classes/FieldProcessing/CurrencyRecord/Label.php
+++ b/application/Espo/Classes/FieldProcessing/CurrencyRecord/Label.php
@@ -29,6 +29,7 @@
namespace Espo\Classes\FieldProcessing\CurrencyRecord;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\FieldProcessing\Loader;
use Espo\Core\FieldProcessing\Loader\Params;
use Espo\Core\Utils\Language;
@@ -42,7 +43,8 @@ use ValueError;
class Label implements Loader
{
public function __construct(
- private Language $defaultLanguage
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
+ private Language $defaultLanguage,
) {}
public function process(Entity $entity, Params $params): void
diff --git a/application/Espo/Core/Authentication/Ldap/LdapLogin.php b/application/Espo/Core/Authentication/Ldap/LdapLogin.php
index bba7939071..437263c543 100644
--- a/application/Espo/Core/Authentication/Ldap/LdapLogin.php
+++ b/application/Espo/Core/Authentication/Ldap/LdapLogin.php
@@ -30,6 +30,7 @@
namespace Espo\Core\Authentication\Ldap;
use Espo\Core\Api\Util;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\FieldProcessing\Relation\LinkMultipleSaver;
use Espo\Core\FieldProcessing\EmailAddress\Saver as EmailAddressSaver;
use Espo\Core\FieldProcessing\PhoneNumber\Saver as PhoneNumberSaver;
@@ -73,6 +74,7 @@ class LdapLogin implements Login
private Config $config,
private EntityManager $entityManager,
private PasswordHash $passwordHash,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
Language $defaultLanguage,
private Log $log,
private Espo $baseLogin,
diff --git a/application/Espo/Core/Utils/Language.php b/application/Espo/Core/Utils/Language.php
index 17752e8ff5..5c03b62a46 100644
--- a/application/Espo/Core/Utils/Language.php
+++ b/application/Espo/Core/Utils/Language.php
@@ -39,6 +39,27 @@ use stdClass;
class Language
{
+ /**
+ * DI qualifier. The language selected as the system default.
+ *
+ * @since 10.1.0
+ */
+ public const string QUALIFIER_DEFAULT = 'default';
+
+ /**
+ * DI qualifier. The base language, en_US.
+ *
+ * @since 10.1.0
+ */
+ public const string QUALIFIER_BASE = 'base';
+
+ /**
+ * DI qualifier. The language selected in the current user's preferences.
+ *
+ * @since 10.1.0
+ */
+ public const string QUALIFIER_USER = 'user';
+
/** @var array<string, array<string, mixed>> */
private $data = [];
/** @var array<string, array<string, mixed>> */
diff --git a/application/Espo/Core/Utils/ScheduledJob/Populator.php b/application/Espo/Core/Utils/ScheduledJob/Populator.php
index 5faded12d0..e9705f3dc4 100644
--- a/application/Espo/Core/Utils/ScheduledJob/Populator.php
+++ b/application/Espo/Core/Utils/ScheduledJob/Populator.php
@@ -29,6 +29,7 @@
namespace Espo\Core\Utils\ScheduledJob;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Utils\Language;
use Espo\Core\Utils\Metadata;
use Espo\Entities\ScheduledJob;
@@ -43,6 +44,7 @@ class Populator
public function __construct(
private EntityManager $entityManager,
private Metadata $metadata,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
) {}
diff --git a/application/Espo/Hooks/Pipeline/CreateStages.php b/application/Espo/Hooks/Pipeline/CreateStages.php
index 35f9755f07..57be4cabe0 100644
--- a/application/Espo/Hooks/Pipeline/CreateStages.php
+++ b/application/Espo/Hooks/Pipeline/CreateStages.php
@@ -29,6 +29,7 @@
namespace Espo\Hooks\Pipeline;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Hook\Hook\AfterSave;
use Espo\Core\ORM\Repository\Option\SaveOption;
use Espo\Core\Utils\Language;
@@ -47,6 +48,7 @@ class CreateStages implements AfterSave
{
public function __construct(
private EntityManager $entityManager,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private Defs $defs,
private EnumOptionsProvider $enumOptionsProvider,
diff --git a/application/Espo/Modules/Crm/Tools/Campaign/MailMergeService.php b/application/Espo/Modules/Crm/Tools/Campaign/MailMergeService.php
index 795a9ddc48..4a40875292 100644
--- a/application/Espo/Modules/Crm/Tools/Campaign/MailMergeService.php
+++ b/application/Espo/Modules/Crm/Tools/Campaign/MailMergeService.php
@@ -30,6 +30,7 @@
namespace Espo\Modules\Crm\Tools\Campaign;
use Espo\Core\Acl;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Error;
use Espo\Core\Exceptions\Forbidden;
@@ -61,22 +62,13 @@ class MailMergeService
'users',
];
- private EntityManager $entityManager;
- private Acl $acl;
- private Language $defaultLanguage;
- private MailMergeGenerator $generator;
-
public function __construct(
- EntityManager $entityManager,
- Acl $acl,
- Language $defaultLanguage,
- MailMergeGenerator $generator
- ) {
- $this->entityManager = $entityManager;
- $this->acl = $acl;
- $this->defaultLanguage = $defaultLanguage;
- $this->generator = $generator;
- }
+ private EntityManager $entityManager,
+ private Acl $acl,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
+ private Language $defaultLanguage,
+ private MailMergeGenerator $generator,
+ ) {}
/**
* @return string An attachment ID.
diff --git a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php
index 7ed57b7259..b050e3f44b 100644
--- a/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php
+++ b/application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php
@@ -29,6 +29,7 @@
namespace Espo\Modules\Crm\Tools\MassEmail;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Modules\Crm\Tools\MassEmail\MessagePreparator\Headers;
use Espo\Core\Field\DateTime;
use Espo\Core\Mail\ConfigDataProvider;
@@ -73,6 +74,7 @@ class SendingProcessor
public function __construct(
private Config $config,
private EntityManager $entityManager,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private EmailSender $emailSender,
private Log $log,
diff --git a/application/Espo/Tools/EntityManager/EntityManager.php b/application/Espo/Tools/EntityManager/EntityManager.php
index 1dab8900d0..3f49139adb 100644
--- a/application/Espo/Tools/EntityManager/EntityManager.php
+++ b/application/Espo/Tools/EntityManager/EntityManager.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\EntityManager;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Exceptions\Error;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Forbidden;
@@ -67,7 +68,9 @@ class EntityManager
public function __construct(
private Metadata $metadata,
+ #[Qualify(Language::QUALIFIER_USER)]
private Language $language,
+ #[Qualify(Language::QUALIFIER_BASE)]
private Language $baseLanguage,
private FileManager $fileManager,
private Config $config,
diff --git a/application/Espo/Tools/EntityManager/Hook/Hooks/CategoriesUpdateHook.php b/application/Espo/Tools/EntityManager/Hook/Hooks/CategoriesUpdateHook.php
index 46e6420257..0994790099 100644
--- a/application/Espo/Tools/EntityManager/Hook/Hooks/CategoriesUpdateHook.php
+++ b/application/Espo/Tools/EntityManager/Hook/Hooks/CategoriesUpdateHook.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\EntityManager\Hook\Hooks;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\DataManager;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Conflict;
@@ -63,6 +64,7 @@ class CategoriesUpdateHook implements UpdateHook
public function __construct(
private InjectableFactory $injectableFactory,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private Metadata $metadata,
private DataManager $dataManager,
diff --git a/application/Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php b/application/Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php
index d28d1c7705..374462f653 100644
--- a/application/Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php
+++ b/application/Espo/Tools/EntityManager/Hook/Hooks/EventCreateHook.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\EntityManager\Hook\Hooks;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Templates\Entities\Event;
use Espo\Core\Utils\Language;
use Espo\Tools\EntityManager\Hook\CreateHook;
@@ -37,6 +38,7 @@ use Espo\Tools\EntityManager\Params;
class EventCreateHook implements CreateHook
{
public function __construct(
+ #[Qualify(Language::QUALIFIER_BASE)]
private Language $baseLanguage,
private Language $language
) {}
diff --git a/application/Espo/Tools/EntityManager/Hook/Hooks/EventDeleteHook.php b/application/Espo/Tools/EntityManager/Hook/Hooks/EventDeleteHook.php
index 5d286c76c3..bb5149f75a 100644
--- a/application/Espo/Tools/EntityManager/Hook/Hooks/EventDeleteHook.php
+++ b/application/Espo/Tools/EntityManager/Hook/Hooks/EventDeleteHook.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\EntityManager\Hook\Hooks;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Templates\Entities\Event;
use Espo\Core\Utils\Language;
use Espo\Tools\EntityManager\Hook\DeleteHook;
@@ -37,6 +38,7 @@ use Espo\Tools\EntityManager\Params;
class EventDeleteHook implements DeleteHook
{
public function __construct(
+ #[Qualify(Language::QUALIFIER_BASE)]
private Language $baseLanguage,
private Language $language
) {}
diff --git a/application/Espo/Tools/FieldManager/FieldManager.php b/application/Espo/Tools/FieldManager/FieldManager.php
index ec52540d28..8939181cf7 100644
--- a/application/Espo/Tools/FieldManager/FieldManager.php
+++ b/application/Espo/Tools/FieldManager/FieldManager.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\FieldManager;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\ORM\Type\FieldType;
use Espo\Core\Utils\Metadata;
use Espo\Core\Utils\Language;
@@ -65,6 +66,7 @@ class FieldManager
private InjectableFactory $injectableFactory,
private Metadata $metadata,
private Language $language,
+ #[Qualify(Language::QUALIFIER_BASE)]
private Language $baseLanguage,
private MetadataHelper $metadataHelper,
private NameUtil $nameUtil
diff --git a/application/Espo/Tools/LeadCapture/CaptureService.php b/application/Espo/Tools/LeadCapture/CaptureService.php
index d2de2c1f25..6d3f9a7cf7 100644
--- a/application/Espo/Tools/LeadCapture/CaptureService.php
+++ b/application/Espo/Tools/LeadCapture/CaptureService.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\LeadCapture;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Field\Link;
use Espo\Core\FieldValidation\Exceptions\ValidationError;
@@ -70,6 +71,7 @@ class CaptureService
public function __construct(
private EntityManager $entityManager,
private FieldUtil $fieldUtil,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private HookManager $hookManager,
private Log $log,
diff --git a/application/Espo/Tools/LeadCapture/ConfirmationSender.php b/application/Espo/Tools/LeadCapture/ConfirmationSender.php
index 9cc26282f3..6c03cd6fdf 100644
--- a/application/Espo/Tools/LeadCapture/ConfirmationSender.php
+++ b/application/Espo/Tools/LeadCapture/ConfirmationSender.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\LeadCapture;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Exceptions\Error;
use Espo\Core\Mail\Account\GroupAccount\AccountFactory;
use Espo\Core\Mail\EmailSender;
@@ -54,6 +55,7 @@ class ConfirmationSender
public function __construct(
private EntityManager $entityManager,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private EmailSender $emailSender,
private AccountFactory $accountFactory,
diff --git a/application/Espo/Tools/LeadCapture/FormService.php b/application/Espo/Tools/LeadCapture/FormService.php
index 3536a3cc30..dc8c8b4ea0 100644
--- a/application/Espo/Tools/LeadCapture/FormService.php
+++ b/application/Espo/Tools/LeadCapture/FormService.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\LeadCapture;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Exceptions\NotFound;
use Espo\Core\ORM\Type\FieldType;
use Espo\Core\Utils\Address\CountryDataProvider;
@@ -54,6 +55,7 @@ class FormService
private EntityManager $entityManager,
private Config $config,
private Metadata $metadata,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private CountryDataProvider $countryDataProvider,
private LanguageService $languageService,
diff --git a/application/Espo/Tools/LinkManager/LinkManager.php b/application/Espo/Tools/LinkManager/LinkManager.php
index 0a1deed335..8c7597d958 100644
--- a/application/Espo/Tools/LinkManager/LinkManager.php
+++ b/application/Espo/Tools/LinkManager/LinkManager.php
@@ -29,6 +29,7 @@
namespace Espo\Tools\LinkManager;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\DataManager;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Conflict;
@@ -69,6 +70,7 @@ class LinkManager
public function __construct(
private Metadata $metadata,
private Language $language,
+ #[Qualify(Language::QUALIFIER_BASE)]
private Language $baseLanguage,
private DataManager $dataManager,
private LinkHookProcessor $linkHookProcessor,
diff --git a/application/Espo/Tools/Pdf/MassService.php b/application/Espo/Tools/Pdf/MassService.php
index fafde7f9db..a853d46115 100644
--- a/application/Espo/Tools/Pdf/MassService.php
+++ b/application/Espo/Tools/Pdf/MassService.php
@@ -31,6 +31,7 @@ namespace Espo\Tools\Pdf;
use DateTime;
use Espo\Core\Acl;
+use Espo\Core\Binding\Attributes\Qualify;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\Error;
use Espo\Core\Exceptions\Forbidden;
@@ -66,6 +67,7 @@ class MassService
private DataLoaderManager $dataLoaderManager,
private SelectBuilderFactory $selectBuilderFactory,
private Builder $builder,
+ #[Qualify(Language::QUALIFIER_DEFAULT)]
private Language $defaultLanguage,
private JobSchedulerFactory $jobSchedulerFactory,
private FileStorageManager $fileStorageManager,