Merge pull request #5462 from AngelFQC/BT21613

Internal: Restoring mail conf variables

composer.json

@@ -95,6 +95,7 @@
         "laminas/laminas-permissions-acl": "~2.8",
         "league/csv": "^9.7",
         "league/glide-symfony": "^2.0",
+        "league/html-to-markdown": "^5.1",
         "league/mime-type-detection": "^1.7",
         "lexik/jwt-authentication-bundle": "^2.20",
         "maennchen/zipstream-php": "^2.1",
@@ -120,6 +121,7 @@
         "symfony/apache-pack": "^1.0",
         "symfony/asset": "6.4.*",
         "symfony/cache": "6.4.*",
+        "symfony/doctrine-messenger": "6.4.*",
         "symfony/dotenv": "6.4.*",
         "symfony/expression-language": "6.4.*",
         "symfony/flex": "^2.4",

config/packages/mailer.yaml

@@ -1,3 +1,13 @@
 framework:
     mailer:
         dsn: '%env(MAILER_DSN)%'
+
+when@dev:
+    framework:
+        mailer:
+            dsn: 'null://null'
+
+when@test:
+    framework:
+        mailer:
+            dsn: 'null://null'

config/packages/messenger.yaml

@@ -10,14 +10,17 @@ framework:
             # failed: 'doctrine://default?queue_name=failed'
             # sync: 'sync://'
 
-        routing:
-            # Route your messages to the transports
-            'Chamilo\CoreBundle\Entity\Message': sync_priority_high
+when@test:
+    framework:
+        messenger:
+            transports:
+                sync_priority_high: 'in-memory://'
 
-# when@test:
+#when@prod:
 #    framework:
 #        messenger:
 #            transports:
-#                # replace with your transport name here (e.g., my_transport: 'in-memory://')
-#                # For more Messenger testing tools, see https://github.com/zenstruck/messenger-test
-#                async: 'in-memory://'
+#                mail_async: "%env(MESSENGER_TRANSPORT_DSN)%"
+#
+#            routing:
+#                'Symfony\Component\Mailer\Messenger\SendEmailMessage': mail_async

config/services.yaml

@@ -91,6 +91,11 @@ services:
         $persistProcessor: '@api_platform.doctrine.orm.state.persist_processor'
         $removeProcessor: '@api_platform.doctrine.orm.state.remove_processor'
 
+    Chamilo\CoreBundle\State\MessageProcessor:
+        bind:
+            $persistProcessor: '@api_platform.doctrine.orm.state.persist_processor'
+            $removeProcessor: '@api_platform.doctrine.orm.state.remove_processor'
+
     Chamilo\CoreBundle\EventSubscriber\AnonymousUserSubscriber:
       tags:
         - name: kernel.event_subscriber

public/main/admin/email_tester.php

@@ -4,13 +4,17 @@
  * Index page of the admin tools.
  */
 // Resetting the course id.
+use Chamilo\CoreBundle\Framework\Container;
+
 $cidReset = true;
 
 // Including some necessary chamilo files.
 require_once __DIR__.'/../inc/global.inc.php';
 
 api_protect_admin_script();
 
+$settingsManager = Container::getSettingsManager();
+
 // Setting the section (for the tabs).
 $this_section = SECTION_PLATFORM_ADMIN;
 $toolName = get_lang('E-mail tester');
@@ -42,7 +46,9 @@
         $values['subject'],
         $values['content'],
         UserManager::formatUserFullName($user),
-        $user->getEmail()
+        'true' === $settingsManager->getSetting('mail.smtp_unique_sender')
+            ? $settingsManager->getSetting('mail.smtp_from_email')
+            : $user->getEmail()
     );
 
     Display::addFlash(