Code suggestion fixes.

Author: alan-cole

web/themes/contrib/civictheme/civictheme.theme

@@ -277,5 +277,5 @@ function civictheme_page_attachments_alter(array &$attachments) {
   catch (ComponentNotFoundException $exception) {
     \Drupal::logger('civictheme')->error('Unable to find alert component: %message', ['%message' => $exception->getMessage()]);
   }
-  $attachments['#cache']['contexts'] = Cache::mergeContexts($variables['#cache']['contexts'] ?? [], ['url.query_args']);
+  $attachments['#cache']['contexts'] = Cache::mergeContexts($attachments['#cache']['contexts'] ?? [], ['url.query_args']);
 }

web/themes/contrib/civictheme/config/schema/civictheme.schema.yml

@@ -225,6 +225,15 @@ civictheme.settings:
             use_media_name:
               label: 'Use name of media'
               type: boolean
+        search:
+          type: mapping
+          label: 'Search settings'
+          mapping:
+            keyword_fields:
+              label: 'Keyword fields'
+              type: sequence
+              sequence:
+                type: string
     colors:
       type: mapping
       label: Colors

web/themes/contrib/civictheme/includes/search.inc

@@ -40,6 +40,8 @@ function civictheme_preprocess_block__civictheme_search(array &$variables): void
 
 /**
  * Implements hook_preprocess_html().
+ *
+ * @SuppressWarnings(PHPMD.StaticAccess)
  */
 function _civictheme_preprocess_html__search_head_title(array &$variables): void {
   // Load search fields from theme settings.
@@ -61,13 +63,12 @@ function _civictheme_preprocess_html__search_head_title(array &$variables): void
   if (empty($keywords)) {
     return;
   }
-  $head_title = (string) $variables['head_title']['title'] ?? '';
+  $head_title = (string) ($variables['head_title']['title'] ?? '');
   if (empty($head_title)) {
     return;
   }
-  $sanitized_keywords = htmlspecialchars($keywords, ENT_QUOTES, 'UTF-8');
   $variables['head_title']['title'] = t("@title - Searching for '@keywords'", [
     '@title' => $head_title,
-    '@keywords' => $sanitized_keywords,
+    '@keywords' => $keywords,
   ]);
 }

web/themes/contrib/civictheme/includes/views.inc

@@ -13,6 +13,7 @@ use Drupal\Component\Utility\Html;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Template\Attribute;
+use Drupal\views\ViewExecutable;
 use Drupal\views\Views;
 
 /**
@@ -162,19 +163,9 @@ function civictheme_preprocess_views_exposed_form(array &$variables): void {
   }
 
   if ($field_count == 1) {
-    // Use inline filter on search and auto pages if a single text field exsits.
-    if (in_array($view->id(), ['civictheme_search', 'civictheme_automated_list'])) {
-      $keyword_field = reset($fields);
-      if ($keyword_field['#type'] === 'textfield') {
-        $variables['inline_filter'] = TRUE;
-        $keyword_field['#title_size'] = 'extra-large';
-        $variables['filter_items'] = $keyword_field;
-        $submit_field = $variables['form']['actions']['submit'] ?? NULL;
-        if (!empty($submit_field)) {
-          $variables['submit_text'] = $submit_field['#value'] ?? '';
-        }
-        return;
-      }
+    // Use inline filter on search and auto pages if a single text field exists.
+    if (_civictheme_preprocess_views__exposed_form__inline_filter($variables, $view, $fields)) {
+      return;
     }
 
     // Use single filter.
@@ -185,6 +176,44 @@ function civictheme_preprocess_views_exposed_form(array &$variables): void {
   }
 }
 
+/**
+ * Preprocess views exposed form to convert it to the Inline filter.
+ *
+ * @param array $variables
+ *   Variables array.
+ * @param \Drupal\views\ViewExecutable|null $view
+ *   The view object.
+ * @param array $fields
+ *   Form fields.
+ *
+ * @return bool
+ *   TRUE if inline filter was processed, FALSE otherwise.
+ */
+function _civictheme_preprocess_views__exposed_form__inline_filter(array &$variables, $view, array $fields): bool {
+  if (!($view instanceof ViewExecutable)) {
+    return FALSE;
+  }
+
+  if (!in_array($view->id(), ['civictheme_search', 'civictheme_automated_list'])) {
+    return FALSE;
+  }
+
+  $keyword_field = reset($fields);
+  if ($keyword_field['#type'] !== 'textfield') {
+    return FALSE;
+  }
+
+  $variables['inline_filter'] = TRUE;
+  $keyword_field['#title_size'] = 'extra-large';
+  $variables['filter_items'] = $keyword_field;
+  $submit_field = $variables['form']['actions']['submit'] ?? NULL;
+  if (!empty($submit_field)) {
+    $variables['submit_text'] = $submit_field['#value'] ?? '';
+  }
+
+  return TRUE;
+}
+
 /**
  * Preprocess views exposed form to convert it to the Single filter.
  */
@@ -282,6 +311,8 @@ function _civictheme_preprocess_views_view__search_page(array &$variables): void
 
 /**
  * Pre-process results count for views.
+ *
+ * @SuppressWarnings(PHPMD.StaticAccess)
  */
 function _civictheme_preprocess_views_view__results_count(array &$variables): void {
   if (empty($variables['results_count'])) {
@@ -294,6 +325,8 @@ function _civictheme_preprocess_views_view__results_count(array &$variables): vo
   // Load search fields from theme settings.
   $setting_keyword_fields = civictheme_get_theme_config_manager()->load('components.search.keyword_fields') ?? '';
   if (empty($setting_keyword_fields)) {
+    // Strip the @keywords token because it exists but won't be populated.
+    $variables['results_count'] = str_replace('@keywords', '', $variables['results_count']);
     return;
   }
 

web/themes/contrib/civictheme/src/Settings/CivicthemeSettingsFormSectionComponents.php

@@ -603,6 +603,18 @@ public function submitFooter(array &$form, FormStateInterface $form_state): void
     );
   }
 
+  /**
+   * Submit callback for theme settings form of Search component.
+   *
+   * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+   * @SuppressWarnings(PHPMD.StaticAccess)
+   */
+  public function submitSearch(array &$form, FormStateInterface $form_state): void {
+    $keyword_fields = $form_state->getValue(['components', 'search', 'keyword_fields'], '');
+    $keyword_fields = CivicthemeUtility::multilineToArray($keyword_fields);
+    $form_state->setValue(['components', 'search', 'keyword_fields'], $keyword_fields);
+  }
+
   /**
    * Provide a description for a path field.
    *