Use more explicit type hints for improved static code analysis

This commit is contained in:
2024-09-22 16:51:54 +02:00
parent bce4268a70
commit fa2985463f
2 changed files with 32 additions and 22 deletions

View File

@ -116,7 +116,7 @@ final class MD_STD_IN_Test extends TestCase {
/**
* Data provider for invalid latitudes.
*
* @return array<array{0: mixed, 1: string}>
* @return array<array{0: mixed, 1: class-string<Throwable>}>
*/
public static function invalid_latitude_provider():array {
@ -588,8 +588,8 @@ final class MD_STD_IN_Test extends TestCase {
/**
* Function for testing validate_longitude().
*
* @param mixed $to_validate Input to validate.
* @param string $exceptionClass Exception class.
* @param mixed $to_validate Input to validate.
* @param class-string<Throwable> $exceptionClass Exception class.
*
* @return void
*/
@ -619,8 +619,8 @@ final class MD_STD_IN_Test extends TestCase {
/**
* Function for testing validate_latitude().
*
* @param mixed $to_validate Input to validate.
* @param string $exceptionClass Exception class.
* @param mixed $to_validate Input to validate.
* @param class-string<Throwable> $exceptionClass Exception class.
*
* @return void
*/
@ -677,9 +677,16 @@ final class MD_STD_IN_Test extends TestCase {
*/
public function test_ensureStringIsUtf8():void {
if (empty($convToIso8859 = iconv("UTF-8", 'ISO-8859-1//TRANSLIT', "ä"))) {
throw new Exception("Iconv returned empty result");
}
if (empty($convToIso2022 = iconv("UTF-8", 'ISO-2022-JP//TRANSLIT', "ä"))) {
throw new Exception("Iconv returned empty result");
}
self::assertEquals("ä", MD_STD_IN::ensureStringIsUtf8("ä"));
self::assertEquals("ä", MD_STD_IN::ensureStringIsUtf8(iconv("UTF-8", 'ISO-8859-1//TRANSLIT', "ä")));
self::assertEquals("a", MD_STD_IN::ensureStringIsUtf8(iconv("UTF-8", 'ISO-2022-JP//TRANSLIT', "ä")));
self::assertEquals("ä", MD_STD_IN::ensureStringIsUtf8($convToIso8859));
self::assertEquals("a", MD_STD_IN::ensureStringIsUtf8($convToIso2022));
}
}