From 7573fee4f0949cce53af376a97837c32e50a5568 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 10 Jan 2026 23:38:00 +0100
Subject: Fix MySQL transliterator_transliterate fallback (#8427)

The string syntax of `strtr()` cannot handle mutibytes characters, so need to be rewritten using an array map approach.
Extend the fallback replacements to include the Windows/ISO charsets of the latin languages for which we have a translation
---
 tests/app/Models/DatabaseDAOTest.php | 116 +++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 tests/app/Models/DatabaseDAOTest.php

(limited to 'tests')

diff --git a/tests/app/Models/DatabaseDAOTest.php b/tests/app/Models/DatabaseDAOTest.php
new file mode 100644
index 000000000..1c619aa5f
--- /dev/null
+++ b/tests/app/Models/DatabaseDAOTest.php
@@ -0,0 +1,116 @@
+<?php
+declare(strict_types=1);
+
+use PHPUnit\Framework\Attributes\DataProvider;
+
+final class DatabaseDAOTest extends \PHPUnit\Framework\TestCase {
+
+	/** @return list<array{string,string,bool,bool}> */
+	public static function provideStrilikeCommon(): array {
+		return [
+			['abc', 'abc', false, true],
+			['AbC', 'aBc', false, true],
+			['zabc', 'abc', false, false],
+			['abcd', 'abc', false, false],
+			['aéc', 'ac', false, false],
+			['abcd', 'bc', true, true],
+			['abcd', 'BC', true, true],
+			['aßc', 'ß', true, true],
+			['aéc', 'é', true, true],
+			['Été', 'Ét', true, true],
+			['aßc', 'ac', true, false],
+			['ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz', false, true],
+			['abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', true, true],
+		];
+	}
+
+	/** @return list<array{string,string,bool,bool}> */
+	public static function provideStrilikeAccents(): array {
+		return [
+			['café', 'cafè', false, false],
+			['Été', 'Eté', false, false],
+			['Été', 'Et', true, false],
+		];
+	}
+
+	/** @return list<array{string,string,bool,bool}> */
+	public static function provideStrilikeNoAccents(): array {
+		return [
+			['café', 'cafè', false, true],
+			['Été', 'Eté', false, true],
+			['Été', 'Et', true, true],
+		];
+	}
+
+	/** @return list<array{string,string,bool,bool}> */
+	public static function provideStrilikeAccentsCasing(): array {
+		return [
+			['Été', 'été', false, true],
+			['AÎNÉE', 'aîné', true, true],
+			['AÎNÉ', 'aine', false, false],
+			['AÎNÉE', 'aine', true, false],
+		];
+	}
+
+	/** @return list<array{string,string,bool,bool}> */
+	public static function provideStrilikeUnicodeCasing(): array {
+		return [
+			['ČĆĐŠŽ', 'čćđšž', false, true],	// Croatian
+			['ÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ', 'áčďéěíňóřšťúůýž', false, true],	// Czech
+			['ÆØÅ', 'æøå', false, true],	// Danish
+			['ŠŽÕÄÖÜ', 'šžõäöü', false, true],	// Estonian
+			['ÄÖ', 'äö', false, true],	// Finnish
+			['ÀÂÆÇÈÉÊËÎÏÔŒÙÛÜŸ', 'àâæçèéêëîïôœùûüÿ', false, true],	// French
+			['ÄÖÜ', 'äöü', false, true],	// German
+			['ΑΆΒΓΔΕΈΖΗΉΘΙΊΪΚΛΜΝΞΟΌΠΡΣΤΥΎΫΦΧΨΩΏ', 'αάβγδεέζηήθιίϊκλμνξοόπρστυύϋφχψωώ', false, true],	// Greek
+			['ÁÉÍÓÖŐÚÜŰ', 'áéíóöőúüű', false, true],	// Hungarian
+			['ÁÉÍÓÚ', 'áéíóú', false, true],	// Irish
+			['ÀÈÉÌÒÓÙ', 'àèéìòóù', false, true],	// Italian
+			['ĀČĒĢĪĶĻŅŠŪŽ', 'āčēģīķļņšūž', false, true],	// Latvian
+			['ĄČĘĖĮŠŲŪŽ', 'ąčęėįšųūž', false, true],	// Lithuanian
+			['ĊĠĦŻ', 'ċġħż', false, true],	// Maltese
+			['ĄĆĘŁŃÓŚŹŻ', 'ąćęłńóśźż', false, true],	// Polish
+			['ÁÂÃÇÉÍÓÕÚ', 'áâãçéíóõú', false, true],	// Portuguese
+			['ĂÂÎȘȚ', 'ăâîșț', false, true],	// Romanian
+			['ÁÄČĎÉÍĹĽŇÓÔŔŠŤÚÝŽ', 'áäčďéíĺľňóôŕšťúýž', false, true],	// Slovak
+			['ČŠŽ', 'čšž', false, true],	// Slovenian
+			['ÁÉÍÑÓÚÜ', 'áéíñóúü', false, true],	// Spanish
+			['ÅÄÖ', 'åäö', false, true],	// Swedish
+		];
+	}
+
+	/** @return list<array{string,string,bool,bool}> */
+	public static function provideStrilikeNoUnicodeCasing(): array {
+		return [
+			['café', 'cafè', false, false],
+			['café', 'Café', true, true],
+			['Été', 'été', true, false],
+		];
+	}
+
+	#[DataProvider('provideStrilikeCommon')]
+	#[DataProvider('provideStrilikeNoAccents')]
+	#[DataProvider('provideStrilikeUnicodeCasing')]
+	public static function test_strilike_MySQL(string $haystack, string $needle, bool $contains, bool $expected): void {
+		if (!function_exists('transliterator_transliterate') && str_contains($haystack, 'α')) {
+			self::markTestSkipped('transliterator_transliterate function not available to handle e.g. Greek.');
+			return;	// @phpstan-ignore deadCode.unreachable
+		}
+		self::assertSame($expected, FreshRSS_DatabaseDAO::strilike($haystack, $needle, $contains));
+	}
+
+	#[DataProvider('provideStrilikeCommon')]
+	#[DataProvider('provideStrilikeAccents')]
+	#[DataProvider('provideStrilikeAccentsCasing')]
+	#[DataProvider('provideStrilikeUnicodeCasing')]
+	public static function test_strilike_PGSQL(string $haystack, string $needle, bool $contains, bool $expected): void {
+		self::assertSame($expected, FreshRSS_DatabaseDAOPGSQL::strilike($haystack, $needle, $contains));
+	}
+
+	#[DataProvider('provideStrilikeCommon')]
+	#[DataProvider('provideStrilikeAccents')]
+	#[DataProvider('provideStrilikeNoUnicodeCasing')]
+	public static function test_strilike_SQLite(string $haystack, string $needle, bool $contains, bool $expected): void {
+		self::assertSame($expected, FreshRSS_DatabaseDAOSQLite::strilike($haystack, $needle, $contains));
+	}
+}
-- 
cgit v1.2.3