museum-digital/MDNodaHelpers
35
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Improve type-safety / explicitness

Browse Source
This commit is contained in:
Joshua Ramon Enslin
2020-09-21 10:49:34 +02:00
committed by Stefan Rohde-Enslin
parent e4558ae227
commit dd2fbafd25
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NodaTimeAutotranslater.php
View File

@ -166,7 +166,7 @@ final class NodaTimeAutotranslater {
if (intval($zeit_ende) >= 0 && intval($zeit_beginn) < 0) {
return self::TRANSLATABLE_NOT;
}
if (intval($zeit_ende) < 1000 || intval($zeit_ende) < 0 && intval($zeit_beginn) < 0) {
if (intval($zeit_ende) < 0 && intval($zeit_beginn) < 0 || intval($zeit_ende) < 1000) {
return self::TRANSLATABLE_AS_YEAR_WITH_SUFFIX;
}
// Conditions speaking against translatability.
@ -235,7 +235,7 @@ final class NodaTimeAutotranslater {
*/
public function translate(array $timeInfo):void {
if (!($translation_type = self::check_translatability($timeInfo['zeit_beginn'], $timeInfo['zeit_ende'], (string)$timeInfo['zeit_zaehlzeit_monat']))) {
if (!($translation_type = self::check_translatability((string)$timeInfo['zeit_beginn'], (string)$timeInfo['zeit_ende'], (string)$timeInfo['zeit_zaehlzeit_monat']))) {
throw new MDgenericInvalidInputsException("Non-translatable date");
}