552 symfony mailer

app/AppKernel.php

@@ -19,7 +19,6 @@ public function registerBundles(): array
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Symfony\Bundle\TwigBundle\TwigBundle(),
             new \Symfony\Bundle\MonologBundle\MonologBundle(),
-            new \Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
             new \ForkCMS\Bundle\InstallerBundle\ForkCMSInstallerBundle(),
             new \ForkCMS\Bundle\CoreBundle\ForkCMSCoreBundle(),
             new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
@@ -32,6 +31,7 @@ public function registerBundles(): array
             new \MailMotor\Bundle\MailChimpBundle\MailMotorMailChimpBundle(),
             new \MailMotor\Bundle\CampaignMonitorBundle\MailMotorCampaignMonitorBundle(),
             new \Liip\ImagineBundle\LiipImagineBundle(),
+            new \Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
         ];
 
         if ($this->getEnvironment() === 'prod') {

app/config/config.yml

@@ -26,6 +26,8 @@ framework:
                 adapter: cache.app
                 public: true
                 default_lifetime: 3600
+    mailer:
+        dsn: '%mailer.dsn%'
     messenger:
         transports:
             async:
@@ -55,6 +57,8 @@ twig:
         - "%fork.form.theme%"
     paths:
       '%site.path_www%/src/Frontend/Modules/': ForkFrontendModules
+      '%site.path_www%/src/Backend/Modules/': ForkBackendModules
+      '%site.path_www%/src/Backend/Core/': ForkBackendCore
 
 monolog:
     handlers:
@@ -63,17 +67,6 @@ monolog:
             path:  "%site.path_www%/var/logs/%kernel.environment%/error.log"
             level: error
             max_files: 10
-        # swift:
-        #     type:       swift_mailer
-        #     from_email: %fork.debug_email%
-        #     to_email:   %fork.debug_email%
-        #     subject:    %site.default_title% %fork.debug_message%
-        #     level:      error
-        #     formatter:  monolog.formatter.html
-        #     content_type: text/html
-
-swiftmailer:
-    transport: "sendmail"
 
 liip_imagine:
     resolvers:
@@ -167,15 +160,6 @@ services:
             # and caused some queries to break.
             - [ execute, [ 'SET sql_mode = REPLACE(@@SESSION.sql_mode, "ONLY_FULL_GROUP_BY", "")'] ]
             - [ setDebug, [ "%kernel.debug%" ]]
-    mailer_configurator:
-        class: Common\Mailer\Configurator
-        tags:
-            - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest }
-            - { name: kernel.event_listener, event: console.command, method: onConsoleCommand }
-        arguments:
-            - "@fork.settings"
-            - "@service_container"
-
     cache.filesystem.adapter:
         class: League\Flysystem\Adapter\Local
         arguments:
@@ -265,6 +249,11 @@ services:
         tags:
             - { name: twig.extension }
 
+    Common\Core\Twig\Extensions\UtmExtension:
+        public: false
+        tags:
+            - { name: twig.extension }
+
     ForkCMS\Google\TagManager\DataLayer:
         public: true
 
@@ -296,3 +285,11 @@ services:
         alias: 'Symfony\Component\Messenger\MessageBusInterface'
         public: true
 
+    Symfony\Component\Mailer\MailerInterface:
+        alias: mailer.mailer
+        public: true
+
+    Common\Mailer\EmailFactory:
+        public: true
+        arguments:
+            - "@fork.settings"

app/config/config_install.yml

@@ -79,3 +79,8 @@ services:
         public: true
         arguments:
             - "%site.path_www%"
+
+    Common\Mailer\EmailFactory:
+        public: true
+        arguments:
+            - "@fork.settings"

app/config/parameters.yml.dist

@@ -23,4 +23,6 @@ parameters:
     action.group_tag:       '<action-group-tag>'
     action.rights_level:    <action-rights-level>
 
+    mailer.dsn: 'smtp://127.0.0.1:1025'
+
     sentry.dsn: ''

app/config/parameters.yml.test

@@ -22,3 +22,5 @@ parameters:
 
     action.group_tag:       '\@actiongroup'
     action.rights_level:    7
+
+    mailer.dsn: 'null://null'

composer.json

@@ -37,9 +37,7 @@
         "simple-bus/doctrine-orm-bridge": "6.2.*",
         "simple-bus/symfony-bridge": "~6.2",
         "spoon/library": "^4.0",
-        "swiftmailer/swiftmailer": "^6.0",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/swiftmailer-bundle": "^3.0",
         "symfony/console": "^5.4",
         "symfony/dotenv": "^5.4",
         "symfony/framework-bundle": "^5.4",
@@ -52,14 +50,18 @@
         "symfony/expression-language": "^5.4",
         "symfony/translation": "^5.4",
         "symfony/intl": "^5.4",
-        "tijsverkoyen/css-to-inline-styles": "^2.0",
         "phpoffice/phpspreadsheet": "^5.4",
         "guzzlehttp/guzzle": "^7.10",
         "doctrine/annotations": "^1.14",
         "sentry/sentry-symfony": "^5.8",
         "symfony/dom-crawler": "^5.4",
         "symfony/messenger": "^5.4",
-        "symfony/string": "^5.4"
+        "symfony/string": "^5.4",
+        "symfony/mailer": "^5.4",
+        "twig/extra-bundle": "^3.23",
+        "twig/cssinliner-extra": "^3.23",
+        "twig/string-extra": "^3.23",
+        "twig/inky-extra": "^3.23"
     },
     "require-dev": {
         "jdorn/sql-formatter": "1.2.17",

src/Backend/Core/Installer/Data/locale.xml

@@ -2822,23 +2822,6 @@
         <translation language="tr"><![CDATA[örn. 20/06/2011]]></translation>
         <translation language="pt"><![CDATA[ex.: 18/08/2017]]></translation>
       </item>
-      <item type="message" name="HelpDisplayNameChanges">
-        <translation language="nl"><![CDATA[Het aantal weergave naam aanpassingen is gelimiteerd tot %1$s. Je kan nog %2$s wijziging(en) maken.]]></translation>
-        <translation language="en"><![CDATA[The amount of display name changes is limited to %1$s. You have %2$s change(s) left.]]></translation>
-        <translation language="fr"><![CDATA[Le nombre de changement de nom d'affichage est limité à %1$s. Vous pouvez encore faire %2$s changement(s).]]></translation>
-        <translation language="it"><![CDATA[Puoi cambiare il nome un massimo di %1$s volte. Hai ancora %2$s modifiche possibili.]]></translation>
-        <translation language="hu"><![CDATA[A becenevedet %1$s alkalommal tudod megváltoztatni. Neked maradt még %2$s alkalom.]]></translation>
-        <translation language="ru"><![CDATA[Вы можете изменить своё имя всего %1$s раз. Осталось %2$s.]]></translation>
-        <translation language="zh"><![CDATA[显示名称允许更改%1$s次，当前剩余%2$s次更改机会。]]></translation>
-        <translation language="de"><![CDATA[Die Anzahl an Nichname-Änderungen ist auf %1$s limitiert. Du hast noch %2$s Änderung(en) übrig.]]></translation>
-        <translation language="es"><![CDATA[El número de veces que puedes cambiar el nombre a mostrar esta limitado a %1$s. Te quedan %2$s .]]></translation>
-        <translation language="lt"><![CDATA[Jus galite savo vardą keisti %1$s kartų. Liko %2$s kartų.]]></translation>
-        <translation language="uk"><![CDATA[Ви можете змінити своє ім'я всього %1$s раз. Залишилося %2$s.]]></translation>
-        <translation language="sv"><![CDATA[Antalet ändringar av ditt visningsnamn är begränsat till %1$s. Du har %2$s ändring(ar) kvar..]]></translation>
-        <translation language="el"><![CDATA[Οι επιτρεπόμενες αλλαγές στο όνομα οθόνης είναι %1$s. Σας απέμειναν  %2$s αλλαγές.]]></translation>
-        <translation language="pl"><![CDATA[Ilość zmian wyświetlanej nazwy jest ograniczona do %1$s. Pozostały ci %2$s zmiany.]]></translation>
-        <translation language="pt"><![CDATA[O número de vezes que pode alterar o seu nome de ecrã está limitado a %1$s vez(es). Ainda dispõe de %2$s alterações.]]></translation>
-      </item>
       <item type="message" name="HelpImageField">
         <translation language="nl"><![CDATA[Enkel bestanden met extensie jp(e)g, gif of png zijn toegelaten.]]></translation>
         <translation language="en"><![CDATA[Only jp(e)g, gif or png-files are allowed.]]></translation>