diff --git a/src/LanguageLoader.php b/src/LanguageLoader.php index b3c4fbfe86ced00f0159ec57d3855b83f9157777..9c2e9368b59cc365cc68ab280ec417751e2bdb8b 100644 --- a/src/LanguageLoader.php +++ b/src/LanguageLoader.php @@ -53,7 +53,7 @@ public static function languages($hydrate = false) static::$languages = json_decode(static::getFile(__DIR__.'/../resources/languages.json'), true); } - return $hydrate ? array_map(fn($language): Language => new Language($language), static::$languages) : static::$languages; + return $hydrate ? array_map(fn ($language): Language => new Language($language), static::$languages) : static::$languages; } /** @@ -243,7 +243,7 @@ protected static function collapse($array): array * * @return string */ - public static function getFile($filePath): string | false + public static function getFile($filePath): string|false { if (! file_exists($filePath)) { throw LanguageLoaderException::invalidLanguage(); diff --git a/src/Providers/LanguageServiceProvider.php b/src/Providers/LanguageServiceProvider.php index 3afbcf91514cfd346771854d0cfee80b801cb363..adb27c5c61d04ece101c02c6f259779aa157bcdd 100644 --- a/src/Providers/LanguageServiceProvider.php +++ b/src/Providers/LanguageServiceProvider.php @@ -15,6 +15,6 @@ class LanguageServiceProvider extends ServiceProvider public function boot(): void { // Add language validation rule - Validator::extend('language', fn($attribute, $value): bool => is_string($value) && mb_strlen($value) === 2 && array_key_exists(mb_strtolower($value), languages()), __('validation.invalid_language')); + Validator::extend('language', fn ($attribute, $value): bool => is_string($value) && mb_strlen($value) === 2 && array_key_exists(mb_strtolower($value), languages()), __('validation.invalid_language')); } } diff --git a/src/helpers.php b/src/helpers.php index e3b62b3dbda3c5c62147882ca45d327062756b1a..37e5be9bec11f981f08539400df8fe58ba897bce 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -2,7 +2,6 @@ declare(strict_types=1); use Rinvex\Language\Language; - use Rinvex\Language\LanguageLoader; if (! function_exists('language')) { diff --git a/tests/Unit/LanguageLoaderTest.php b/tests/Unit/LanguageLoaderTest.php index d87593db6f50b96493e84565a1b3e2f140ab61bf..5b6c02bf89d2c262d88ca64dabc20bd0dadffadf 100644 --- a/tests/Unit/LanguageLoaderTest.php +++ b/tests/Unit/LanguageLoaderTest.php @@ -130,13 +130,13 @@ public function it_throws_an_exception_when_invalid_language(): void public function it_filters_data(): void { $array1 = [['id' => 1, 'name' => 'Hello'], ['id' => 2, 'name' => 'World']]; - $this->assertEquals([1 => ['id' => 2, 'name' => 'World']], self::$methods['filter']->invoke(null, $array1, fn($item): bool => $item['id'] === 2)); + $this->assertEquals([1 => ['id' => 2, 'name' => 'World']], self::$methods['filter']->invoke(null, $array1, fn ($item): bool => $item['id'] === 2)); $array2 = ['', 'Hello', '', 'World']; $this->assertEquals(['Hello', 'World'], array_values(self::$methods['filter']->invoke(null, $array2))); $array3 = ['id' => 1, 'first' => 'Hello', 'second' => 'World']; - $this->assertEquals(['first' => 'Hello', 'second' => 'World'], self::$methods['filter']->invoke(null, $array3, fn($item, $key): bool => $key !== 'id')); + $this->assertEquals(['first' => 'Hello', 'second' => 'World'], self::$methods['filter']->invoke(null, $array3, fn ($item, $key): bool => $key !== 'id')); } #[Test] @@ -149,7 +149,7 @@ public function it_gets_data(): void $this->assertEquals('Taylor', self::$methods['get']->invoke(null, $array, '0.users.0.name')); $this->assertNull(self::$methods['get']->invoke(null, $array, '0.users.3')); $this->assertEquals('Not found', self::$methods['get']->invoke(null, $array, '0.users.3', 'Not found')); - $this->assertEquals('Not found', self::$methods['get']->invoke(null, $array, '0.users.3', fn(): string => 'Not found')); + $this->assertEquals('Not found', self::$methods['get']->invoke(null, $array, '0.users.3', fn (): string => 'Not found')); $this->assertEquals('Taylor', self::$methods['get']->invoke(null, $dottedArray, ['users', 'first.name'])); $this->assertNull(self::$methods['get']->invoke(null, $dottedArray, ['users', 'middle.name'])); $this->assertEquals('Not found', self::$methods['get']->invoke(null, $dottedArray, ['users', 'last.name'], 'Not found'));