Merge branch 'feature/elisions' into v3

Fixes #12467
Resolves #12474

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 - Template caching is no longer enabled for tokenized requests. ([#12458](https://github.com/craftcms/cms/issues/12458))
+- Elisions are now stripped from search keywords. ([#12467](https://github.com/craftcms/cms/issues/12467), [#12474](https://github.com/craftcms/cms/pull/12474))
 - Fixed an error that could occur when processing template caches in a console request, if a globally-scoped template cache was processed before it.
 
 ## 3.7.62 - 2022-12-13

src/helpers/Search.php

@@ -51,6 +51,9 @@ public static function normalizeKeywords($str, array $ignore = [], bool $process
         if ($processCharMap) {
             $str = strtr($str, StringHelper::asciiCharMap(true, $language ?? Craft::$app->language));
 
+            $elisions = self::_getElisions();
+            $str = str_replace($elisions, '', $str);
+
             // Remove punctuation and diacritics
             $punctuation = self::_getPunctuation();
             $str = str_replace(array_keys($punctuation), $punctuation, $str);
@@ -68,6 +71,36 @@ public static function normalizeKeywords($str, array $ignore = [], bool $process
         return trim(preg_replace(['/[\n\r]+/u', '/\s{2,}/u'], ' ', $str));
     }
 
+    /**
+     * Returns an array of elisions to remove from search keywords.
+     *
+     * @return array
+     */
+    private static function _getElisions(): array
+    {
+        static $elisions = [];
+
+        if (empty($elisions)) {
+            $elisions = [
+                "l'",
+                "m'",
+                "t'",
+                "qu'",
+                "n'",
+                "s'",
+                "j'",
+                "d'",
+                "c'",
+                "jusqu'",
+                "quoiqu'",
+                "lorsqu'",
+                "puisqu'",
+            ];
+        }
+
+        return $elisions;
+    }
+
     /**
      * Returns the asciiPunctuation array.
      *