Skip to content

Commit ebd2668

Browse files
authored
Mail: Use mailer DSN as setting and adapt migrations accordingly - refs #6477
Author: @AngelFQC
1 parent 6d6f928 commit ebd2668

25 files changed

+544
-655
lines changed

.env.dist

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,7 @@ APP_ENABLE_API_ENTRYPOINT=false
4343
###< chamilo ###
4444

4545
###> symfony/mailer ###
46-
MAILER='{{MAILER}}'
47-
SMTP_HOST='{{SMTP_HOST}}'
48-
SMTP_PORT='{{SMTP_PORT}}'
49-
SMTP_AUTH='{{SMTP_AUTH}}'
50-
SMTP_USER='{{SMTP_USER}}'
51-
SMTP_PASS='{{SMTP_PASS}}'
52-
SMTP_SECURE='{{SMTP_SECURE}}'
53-
SMTP_CHARSET='{{SMTP_CHARSET}}'
54-
SMTP_UNIQUE_REPLY_TO='{{SMTP_UNIQUE_REPLY_TO}}'
55-
SMTP_DEBUG='{{SMTP_DEBUG}}'
56-
57-
MAILER_DSN='{{MAILER_DSN}}'
58-
MAILER_FROM_EMAIL='{{MAILER_FROM_EMAIL}}'
59-
MAILER_FROM_NAME='{{MAILER_FROM_NAME}}'
46+
# MAILER_DSN='null://null'
6047
###< symfony/mailer ###
6148

6249
###> nelmio/cors-bundle ###

.github/workflows/behat.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ jobs:
154154
cd ..
155155
sed -i "s/APP_ENV='dev'/APP_ENV='prod'/g" .env
156156
sed -i "s/APP_DEBUG='1'/APP_DEBUG='0'/g" .env
157-
sed -i "s/MAILER_DSN=sendmail:\/\/default/MAILER_DSN=null:\/\/null/g" .env
158157
sudo php bin/console cache:clear
159158
sudo chmod -R 777 var public
160159

assets/vue/AppInstaller.vue

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -210,63 +210,18 @@
210210
/>
211211

212212
<input
213-
v-model="installerData.stepData.fromEmail"
214-
name="fromEmail"
213+
v-model="installerData.stepData.mailerFromEmail"
214+
name="mailerFromEmail"
215215
type="hidden"
216216
/>
217217
<input
218-
v-model="installerData.stepData.fromName"
219-
name="fromName"
218+
v-model="installerData.stepData.mailerFromName"
219+
name="mailerFromName"
220220
type="hidden"
221221
/>
222222
<input
223-
v-model="installerData.stepData.mailer"
224-
name="mailer"
225-
type="hidden"
226-
/>
227-
<input
228-
v-model="installerData.stepData.smtpHost"
229-
name="smtpHost"
230-
type="hidden"
231-
/>
232-
<input
233-
v-model="installerData.stepData.smtpPort"
234-
name="smtpPort"
235-
type="hidden"
236-
/>
237-
<input
238-
v-model="installerData.stepData.smtpAuth"
239-
name="smtpAuth"
240-
type="hidden"
241-
/>
242-
<input
243-
v-model="installerData.stepData.smtpSecure"
244-
name="smtpSecure"
245-
type="hidden"
246-
/>
247-
<input
248-
v-model="installerData.stepData.smtpUniqueReplyTo"
249-
name="smtpUniqueReplyTo"
250-
type="hidden"
251-
/>
252-
<input
253-
v-model="installerData.stepData.smtpCharset"
254-
name="smtpCharset"
255-
type="hidden"
256-
/>
257-
<input
258-
v-model="installerData.stepData.smtpDebug"
259-
name="smtpDebug"
260-
type="hidden"
261-
/>
262-
<input
263-
v-model="installerData.stepData.smtpUser"
264-
name="smtpUser"
265-
type="hidden"
266-
/>
267-
<input
268-
v-model="installerData.stepData.smtpPass"
269-
name="smtpPass"
223+
v-model="installerData.stepData.mailerDsn"
224+
name="mailerDsn"
270225
type="hidden"
271226
/>
272227

@@ -310,18 +265,9 @@ const installerData = ref(window.installerData)
310265
311266
if (!installerData.value.stepData) {
312267
installerData.value.stepData = {
313-
fromEmail: "",
314-
fromName: "",
315-
mailer: "",
316-
smtpHost: "",
317-
smtpPort: "",
318-
smtpAuth: "",
319-
smtpUser: "",
320-
smtpPass: "",
321-
smtpSecure: "",
322-
smtpCharset: "",
323-
smtpUniqueReplyTo: "",
324-
smtpDebug: "",
268+
mailerFromEmail: "",
269+
mailerFromName: "",
270+
mailerDsn: "",
325271
}
326272
}
327273

0 commit comments

Comments
 (0)