From 829bef8f01cab3bb1827af4ef9586d367580cccb Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 21 Sep 2023 13:00:54 +0000 Subject: [PATCH] fix test bugs --- .github/workflows/main.yml | 1 + Localization/LanguageDetection/NgramParser.php | 3 ++- tests/Localization/LocalizationTest.php | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d33e27d3..c8cccf6a0 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,7 @@ jobs: path: Build - name: Autoformat run: | + ls -la vendor/bin vendor/bin/php-cs-fixer fix ./ --rules='{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"replacements": {"this": "self"}}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}' --allow-risky=yes vendor/bin/phpcbf --standard=Build/Config/phpcs.xml ./ vendor/bin/rector process --dry-run --config Build/Config/rector.php ./ diff --git a/Localization/LanguageDetection/NgramParser.php b/Localization/LanguageDetection/NgramParser.php index 0d2131e87..06e2cfc6b 100755 --- a/Localization/LanguageDetection/NgramParser.php +++ b/Localization/LanguageDetection/NgramParser.php @@ -109,7 +109,8 @@ abstract class NgramParser $sum = \array_sum($token); foreach ($token as $j => $value) { - $tokens[$i][$j] = $value / $sum; + /** @phpstan-ignore-next-line */ + $tokens[$i][$j] = $sum === 0 ? 0 : $value / $sum; } } diff --git a/tests/Localization/LocalizationTest.php b/tests/Localization/LocalizationTest.php index aa331fce7..980f0e9a5 100755 --- a/tests/Localization/LocalizationTest.php +++ b/tests/Localization/LocalizationTest.php @@ -49,9 +49,9 @@ final class LocalizationTest extends \PHPUnit\Framework\TestCase public function testDefault() : void { self::assertEquals(0, $this->localization->getId()); - self::assertTrue(ISO3166TwoEnum::isValidValue($this->localization->getCountry())); + self::assertTrue(ISO3166TwoEnum::isValidValue($this->localization->country)); self::assertTrue(TimeZoneEnumArray::isValidValue($this->localization->getTimezone())); - self::assertTrue(ISO639x1Enum::isValidValue($this->localization->getLanguage())); + self::assertTrue(ISO639x1Enum::isValidValue($this->localization->language)); self::assertTrue(ISO4217CharEnum::isValidValue($this->localization->getCurrency())); self::assertEquals('0', $this->localization->getCurrencyFormat()); self::assertEquals('.', $this->localization->getDecimal()); @@ -146,7 +146,7 @@ final class LocalizationTest extends \PHPUnit\Framework\TestCase public function testCountryInputOutput() : void { $this->localization->setCountry(ISO3166TwoEnum::_USA); - self::assertEquals(ISO3166TwoEnum::_USA, $this->localization->getCountry()); + self::assertEquals(ISO3166TwoEnum::_USA, $this->localization->country); } /** @@ -168,7 +168,7 @@ final class LocalizationTest extends \PHPUnit\Framework\TestCase public function testLanguageInputOutput() : void { $this->localization->setLanguage(ISO639x1Enum::_DE); - self::assertEquals(ISO639x1Enum::_DE, $this->localization->getLanguage()); + self::assertEquals(ISO639x1Enum::_DE, $this->localization->language); } /**