Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

src/CoreBundle/Migrations/Schema/V200/Version20250707212800.php

@@ -34,9 +34,31 @@ private function migrateMailConf(string $oldMailConfPath): array
             return [];
         }
 
-        include $oldMailConfPath;
+        /** @var array{
+         *   SMTP_USER?: string,
+         *   SMTP_PASS?: string,
+         *   SMTP_HOST?: string,
+         *   SMTP_PORT?: string,
+         *   EXCLUDE_JSON?: bool,
+         *   DKIM?: bool,
+         *   DKIM_SELECTOR?: string,
+         *   DKIM_DOMAIN?: string,
+         *   DKIM_PRIVATE_KEY_STRING?: string,
+         *   DKIM_PRIVATE_KEY?: string,
+         *   DKIM_PASSPHRASE?: string,
+         *   XOAUTH2_METHOD?: bool,
+         *   XOAUTH2_URL_AUTHORIZE?: string,
+         *   XOAUTH2_URL_ACCES_TOKEN?: string,
+         *   XOAUTH2_URL_RESOURCE_OWNER_DETAILS?: string,
+         *   XOAUTH2_SCOPES?: string,
+         *   XOAUTH2_CLIENT_ID?: string,
+         *   XOAUTH2_CLIENT_SECRET?: string,
+         *   XOAUTH2_REFRESH_TOKEN?: string,
+         * } $platform_email
+         */
+        $platform_email = [];
 
-        global $platform_email;
+        include $oldMailConfPath;
 
         $mailerScheme = 'null';
         $smtpSecure = $platform_email['SMTP_SECURE'] ?? '';
@@ -48,7 +70,7 @@ private function migrateMailConf(string $oldMailConfPath): array
             if ('ssl' === $smtpSecure) {
                 $mailerScheme = 'smtps';
             } elseif ('tls' === $smtpSecure) {
-                $query = '?encryption=tls';
+                $query = '?require_tls=true';
             }
         }
 

src/CoreBundle/Migrations/Schema/V200/Version20250721200725.php

@@ -18,8 +18,6 @@ public function up(Schema $schema): void
         $updateRootPath = $this->getUpdateRootPath();
         $oldMailConfPath = $updateRootPath.'/app/config/mail.conf.php';
 
-        $legacyMailConfig = file_exists($oldMailConfPath);
-
         $envFile = $projectDir.'/.env';
 
         $dotenv = new Dotenv();
@@ -40,7 +38,7 @@ public function up(Schema $schema): void
                 if ('ssl' === $smtpSecure) {
                     $mailerScheme = 'smtps';
                 } elseif ('tls' === $smtpSecure) {
-                    $query = '?encryption=tls';
+                    $query = '?require_tls=true';
                 }
             }
 
@@ -61,9 +59,31 @@ public function up(Schema $schema): void
             $settings['mailer_debug_enable'] = !empty($_ENV['SMTP_DEBUG']) ? 'true' : 'false';
         }
 
-        if ($legacyMailConfig) {
+        if (file_exists($oldMailConfPath)) {
+            /** @var array{
+             *   EXCLUDE_JSON?: bool,
+             *   DKIM?: bool,
+             *   DKIM_SELECTOR?: string,
+             *   DKIM_DOMAIN?: string,
+             *   DKIM_PRIVATE_KEY_STRING?: string,
+             *   DKIM_PRIVATE_KEY?: string,
+             *   DKIM_PASSPHRASE?: string,
+             *   XOAUTH2_METHOD?: bool,
+             *   XOAUTH2_URL_AUTHORIZE?: string,
+             *   XOAUTH2_URL_ACCES_TOKEN?: string,
+             *   XOAUTH2_URL_RESOURCE_OWNER_DETAILS?: string,
+             *   XOAUTH2_SCOPES?: string,
+             *   XOAUTH2_CLIENT_ID?: string,
+             *   XOAUTH2_CLIENT_SECRET?: string,
+             *   XOAUTH2_REFRESH_TOKEN?: string,
+             * } $platform_email
+             */
+            $platform_email = [];
+
             include $oldMailConfPath;
+
             $settings['mailer_exclude_json'] = $platform_email['EXCLUDE_JSON'] ?? false;
+
             $dkim = [
                 'enable' => $platform_email['DKIM'] ?? false,
                 'selector' => $platform_email['DKIM_SELECTOR'] ?? '',