Merge pull request #120 from KnpLabs/revert-118-module/mailer-v2

Revert "module: mailer v2"
KnpLabs · Apr 23, 2024 · 513b4f7 · 513b4f7
2 parents 3a692d9 + 7c164f6
commit 513b4f7
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 315 deletions.
diff --git a/.env.dist b/.env.dist
@@ -7,4 +7,4 @@ MYSQL_VERSION=8.0.27
 MYSQL_DATABASE=databasorus
 MYSQL_USER=user
 MYSQL_PASSWORD=password
-MAILER_DSN=smtp://mailhog:1025
+MAILER_DSN=smtp://mailhog:1025
diff --git a/assets/images/email/dino.png b/assets/images/email/dino.png
diff --git a/assets/pdf/cgu.pdf b/assets/pdf/cgu.pdf
diff --git a/assets/styles/email/dinosaur_has_been_created.css b/assets/styles/email/dinosaur_has_been_created.css
diff --git a/assets/styles/email/layout.css b/assets/styles/email/layout.css
diff --git a/composer.json b/composer.json
@@ -38,7 +38,6 @@
         "symfony/validator": "^7.0",
         "symfony/web-link": "^7.0",
         "symfony/yaml": "^7.0",
-        "twig/cssinliner-extra": "^3.9",
         "twig/extra-bundle": "^3.8",
         "twig/twig": "^3.8"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/mailer.yaml b/config/packages/mailer.yaml
@@ -1,7 +1,3 @@
 framework:
     mailer:
         dsn: '%env(MAILER_DSN)%'
-        envelope:
-            sender: 'jurrasic.park@mail.com'
-        headers:
-            From: 'Jurassic Park <jurrasic.park@mail.com>'
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
@@ -1,9 +1,6 @@
 twig:
     default_path: '%kernel.project_dir%/templates'
-    paths:
-        '%kernel.project_dir%/assets/images': images
-        '%kernel.project_dir%/assets/styles': styles
-    form_themes:
+    form_themes: 
       - 'bootstrap_5_layout.html.twig'
       - 'form/bootstrap_5_layout.html.twig'
 

diff --git a/config/services.yaml b/config/services.yaml
@@ -8,7 +8,6 @@ parameters:
   env(MYSQL_DATABASE): '%env(resolve:MYSQL_DATABASE)%'
   env(MYSQL_USER): '%env(resolve:MYSQL_USER)%'
   env(MYSQL_PASSWORD): '%env(resolve:MYSQL_PASSWORD)%'
-  app.pdf_directory: '%kernel.project_dir%/assets/pdf'
 
 services:
     # default configuration for services in *this* file

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -42,11 +42,5 @@ services:
             - db-data:/var/lib/mysql:rw
         restart: unless-stopped
 
-    mailhog:
-        image: mailhog/mailhog
-        restart: on-failure
-        ports:
-            - 127.0.0.1:8025:8025
-
 volumes:
     db-data: ~