Issue #331: Done in PR #332

lexhouk · Dec 28, 2024 · 1a1b29c · 1a1b29c
2 parents 57bf12e + 99cf97b
commit 1a1b29c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "drupal/recaptcha_preloader": "2.0.1",
         "drupal/service": "3.0.0",
         "drupal/seven": "1.0.0",
-        "drupal/standwithukraine": "2.0.3",
+        "drupal/standwithukraine": "3.0.0",
         "drupal/symfony_mailer": "1.5.0",
         "php": "^8.3"
     },

diff --git a/d8.info.yml b/d8.info.yml
@@ -3,7 +3,7 @@ description: The installation profile for CMS Drupal 10 based on the most common
 
 type: profile
 core_version_requirement: ^10.3
-version: 0.21.0.189
+version: 0.21.0.190
 
 php: 8.3
 

diff --git a/d8.install b/d8.install
@@ -75,7 +75,7 @@ function _d8_update(): void {
     $sandbox = [];
 
     foreach (func_get_args() as $number) {
-      $function = $matches[1] . '_update_' . $number;
+      $function = "{$matches[1]}_update_$number";
 
       $function($sandbox);
     }

diff --git a/d8.profile b/d8.profile
@@ -51,7 +51,7 @@ function _d8_install_configure_form_submit(
     $values = [];
 
     foreach (['name', 'mail'] as $key) {
-      $values[$key] = (string) $form_state->getValue('site_' . $key);
+      $values[$key] = (string) $form_state->getValue("site_$key");
     }
 
     \Drupal::state()->set('d8', array_filter($values));

diff --git a/modules/features/d8_mail/d8_mail.module b/modules/features/d8_mail/d8_mail.module
@@ -19,9 +19,7 @@ function d8_mail_help(
   $output = '';
 
   if ($route_name === 'help.page.d8_mail') {
-    $output .= '<h3>' . t('About') . '</h3>';
-
-    $output .= '<p>';
+    $output .= "<h3>{t('About')}</h3><p>";
 
     $url = Url::fromRoute('help.page', ['name' => 'symfony_mailer']);
 
@@ -69,7 +67,7 @@ function d8_mail_theme(
   string $path,
 ): array {
   $name = 'email_wrap';
-  return [$name . '__html' => ['base hook' => $name]];
+  return ["{$name}__html" => ['base hook' => $name]];
 }
 
 /**
@@ -80,6 +78,6 @@ function d8_mail_theme_suggestions_email_wrap_alter(
   array $variables,
 ): void {
   if ($variables['is_html']) {
-    $suggestions[] = $variables['theme_hook_original'] . '__html';
+    $suggestions[] = "{$variables['theme_hook_original']}__html";
   }
 }
diff --git a/modules/features/d8_standwithukraine/d8_standwithukraine.info.yml b/modules/features/d8_standwithukraine/d8_standwithukraine.info.yml
@@ -3,7 +3,7 @@ description: Provides a wrapper for the StandWithUkraine 🇺🇦 module.
 package: D8+
 
 type: module
-core_version_requirement: ^10.1
+core_version_requirement: ^10.2 || ^11
 
 dependencies:
   - standwithukraine:standwithukraine