Merge branch 'develop' into 'main'

Merging develop into main

See merge request !81

ahoy.current.yml

@@ -4,7 +4,10 @@ commands:
     cmd: |
       download db ${PROJECT_BRANCH}
       drush @default.dev cr
-      drush -y @default.dev config-split:import develop
+      SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
+      if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:import develop
+      fi
       download files ${PROJECT_BRANCH}
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
@@ -13,7 +16,10 @@ commands:
     cmd: |
       download db ${PROJECT_BRANCH}
       drush @default.dev cr
-      drush -y @default.dev config-split:import develop
+      SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
+      if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:import develop
+      fi
     usage: Pull DB from live site
   pull-files:
     cmd: |

ahoy.cypress.yml

@@ -6,6 +6,7 @@ commands:
       echo "CYPRESS=1" >>.env
       env -i $(cat .env | xargs) >.env
       composer lakedrops:docker4drupal --no-interaction
+      docker compose pull cypress
       ahoy d4d up cypress
     usage: Turn on Cypress
   off:

ahoy.live.yml

@@ -4,7 +4,10 @@ commands:
     cmd: |
       download db main
       drush @default.dev cr
-      drush -y @default.dev config-split:import develop
+      SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
+      if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:import develop
+      fi
       download files main
       chmod -R ugo+w files/default/files
       chmod -R ugo+w files/default/private
@@ -13,7 +16,10 @@ commands:
     cmd: |
       download db main
       drush @default.dev cr
-      drush -y @default.dev config-split:import develop
+      SPLIT=$(drush pm-list --format=json --status=enabled --filter=name=config_split)
+      if [[ "$SPLIT" != "[]" ]]; then
+        drush -y @default.dev config-split:import develop
+      fi
     usage: Pull DB from live site
   pull-files:
     cmd: |

src/Handler.php

@@ -142,6 +142,13 @@ class Handler extends BaseHandler {
         'returnpath' => $this->env->receiveGlobal('MAILPIT_RETURNPATH', 'MailPit Bounce Address'),
         'recipientallowlist' => $this->env->receiveGlobal('MAILPIT_RECIPIENT_ALLOW_LIST', 'MailPit Regex for allowed recipients'),
       ],
+      'symfony_mailer' => [
+        'enable' => 0,
+        'host' => '',
+        'port' => 25,
+        'username' => '',
+        'password' => '',
+      ],
       'varnish' => [
         'enable' => 0,
       ],

templates/settings.docker.php.twig

@@ -33,8 +33,19 @@ $databases = array(
     ),
   ),
 );
-{% if not drupal.live|default(0) or mailhog.enable or mailpit.enable %}
-$config['system.mail']['interface']['default'] = 'SMTPMailSystem';
+{% if not drupal.live|default(0) or mailhog.enable or mailpit.enable or symfony_mailer.enable %}
+$config['system.mail']['interface']['default'] = '{% if symfony_mailer.enable %}symfony_mailer{% else %}SMTPMailSystem{% endif %}';
+{% if symfony_mailer.enable %}
+$config['system.mail']['mailer_dsn'] = [
+  'scheme' => 'smtp',
+  'host' => '{% if mailpit.enable %}mailpit{% elseif mailhog.enable %}mailhog{% else %}{{ symfony_mailer.host }}{% endif %}',
+  'port' => {% if mailpit.enable or mailhog.enable %}1025{% else %}{{ symfony_mailer.port }}{% endif %},
+{% if not mailpit.enable and not mailhog.enable %}
+  'user' => '{{ symfony_mailer.username }}',
+  'password' => '{{ symfony_mailer.password }}',
+{% endif %}
+];
+{% else %}
 $config['smtp.settings']['smtp_on'] = TRUE;
 $config['smtp.settings']['smtp_host'] = '{% if mailhog.enable %}mailhog{% else %}mailpit{% endif %}';
 $config['smtp.settings']['smtp_hostbackup'] = '';
@@ -42,6 +53,7 @@ $config['smtp.settings']['smtp_port'] = '1025';
 $config['smtp.settings']['smtp_protocol'] = 'standard';
 $config['smtp.settings']['smtp_username'] = '';
 $config['smtp.settings']['smtp_password'] = '';
+{% endif %}
 
 $settings['danse_notification_delivery'] = {{ drupal.danse_notification_delivery|default('FALSE') }};
 {% endif %}