Merge pull request #1766 from tomudding/fix/decision-search-highlight…

…-incorrect-offset

Remove `iconv` for decision search highlighting

composer.json

@@ -15,7 +15,6 @@
         "ext-exif": "*",
         "ext-fileinfo": "*",
         "ext-gd": "*",
-        "ext-iconv": "*",
         "ext-intl": "*",
         "ext-imagick": "^3.5.0",
         "ext-mbstring": "*",

module/Decision/view/decision/decision/search.phtml

@@ -23,25 +23,18 @@ function highlightSearch(
     string $decision,
     string $search,
 ): string {
-    // Convert the decision to something that is easily searchable (i.e. it MUST NOT contain any non-ASCII characters).
-    $transliteratedDecision = iconv(
-        'UTF-8',
-        'ASCII//TRANSLIT//IGNORE',
-        transliterator_transliterate('Any-Latin; Latin-ASCII', $decision),
-    );
+    // Convert the decision to something that is easily searchable (i.e. it MUST contain only Latin-ASCII characters).
+    $transliteratedDecision = transliterator_transliterate('Any-Latin; Latin-ASCII', $decision);
     // Do the same for the search prompt, as otherwise searches WITH non-ASCII characters will not work.
-    $search = iconv(
-        'UTF-8',
-        'ASCII//TRANSLIT//IGNORE',
-        transliterator_transliterate('Any-Latin; Latin-ASCII', $search),
-    );
+    $search = transliterator_transliterate('Any-Latin; Latin-ASCII', $search);
 
     $offset = 0;
     $output = '';
     $length = mb_strlen($search);
 
     // There is a very important assumption here; the transliterated version of the decision MUST be exactly as long as
-    // the original version. Otherwise, the insertion is done with an incorrect offset.
+    // the original version. Otherwise, the insertion is done with an incorrect offset. As such, using `iconv` is NOT
+    // good as it will either extend (e.g. `€` becomes `EUR`) or completely remove characters (`//IGNORE` option).
     while (false !== ($position = mb_stripos($transliteratedDecision, $search, $offset, 'UTF-8'))) {
         // Progressively insert markers into the original decision.
         $output .= sprintf('%s%s%s%s',