EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
sender ref
Yuri Kuznetsov520d55b98d13
diff --git a/application/Espo/Binding.php b/application/Espo/Binding.phpindex c38e616d07..03df41f07a 100644--- a/application/Espo/Binding.php+++ b/application/Espo/Binding.php@@ -312,11 +312,6 @@ class Binding implements BindingProcessor'Espo\\Core\\Mail\\Importer','Espo\\Core\\Mail\\Importer\\DefaultImporter');-- $binder->bindImplementation(- 'Espo\\Core\\Mail\\Sender\\TransportPreparator',- 'Espo\\Core\\Mail\\Sender\\DefaultTransportPreparator'- );}private function bindAcl(Binder $binder): voiddiff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.phpindex d771b842a7..1c7050b4ab 100644--- a/application/Espo/Core/Mail/Sender.php+++ b/application/Espo/Core/Mail/Sender.php@@ -31,6 +31,7 @@ namespace Espo\Core\Mail;use Espo\Core\FileStorage\Manager as FileStorageManager;use Espo\Core\Mail\Exceptions\NoSmtp;+use Espo\Core\Mail\Sender\DefaultTransportPreparator;use Espo\Core\Mail\Sender\TransportPreparator;use Espo\Core\ORM\Repository\Option\SaveOption;use Espo\ORM\EntityCollection;@@ -84,7 +85,7 @@ class Senderprivate SendingAccountProvider $accountProvider,private FileStorageManager $fileStorageManager,private ConfigDataProvider $configDataProvider,- private TransportPreparator $transportPreparator,+ private DefaultTransportPreparator $transportPreparator,) {$this->useGlobal();}diff --git a/application/Espo/Core/Mail/Sender/DefaultTransportPreparator.php b/application/Espo/Core/Mail/Sender/DefaultTransportPreparator.phpindex 5e98283c51..d5e0044dfb 100644--- a/application/Espo/Core/Mail/Sender/DefaultTransportPreparator.php+++ b/application/Espo/Core/Mail/Sender/DefaultTransportPreparator.php@@ -44,7 +44,7 @@ use Symfony\Component\Mailer\Transport\TransportInterface;class DefaultTransportPreparator implements TransportPreparator{public function __construct(- private Config $config+ private Config $config,) {}public function prepare(SmtpParams $smtpParams): TransportInterface@@ -79,6 +79,7 @@ class DefaultTransportPreparator implements TransportPreparator$authMechanism = null;+ // @todo For xoauth, set authMechanism, username, password in handlers.$connectionOptions = $smtpParams->getConnectionOptions() ?? [];$authString = $connectionOptions['authString'] ?? null;diff --git a/application/Espo/Core/Mail/SmtpParams.php b/application/Espo/Core/Mail/SmtpParams.phpindex 749b6f63b9..ef36c2bf26 100644--- a/application/Espo/Core/Mail/SmtpParams.php+++ b/application/Espo/Core/Mail/SmtpParams.php@@ -55,7 +55,6 @@ class SmtpParamspublic const AUTH_MECHANISM_PLAIN = 'plain';public const AUTH_MECHANISM_XOAUTH = 'xoauth';-/** @var string[] */private array $paramList = ['server',@@ -158,8 +157,6 @@ class SmtpParams/*** @return ?array<string, mixed>- * @deprecated As of v9.1.0.- * @todo Remove in v10.0. Fix usage of 'connectionOptions'.*/public function getConnectionOptions(): ?array{@@ -217,8 +214,6 @@ class SmtpParams/*** @param ?array<string, mixed> $connectionOptions- * @deprecated As of v9.1.- * @todo Remove in v10.0.*/public function withConnectionOptions(?array $connectionOptions): self{