neon with bom (#102)

composer.json

@@ -20,7 +20,7 @@
     "nette/di": "^3.0.6",
     "nette/finder": "^2.5.2",
     "nette/http": "^3.0",
-    "nette/neon": "^3.0",
+    "nette/neon": "^3.3.1",
     "nette/schema": "^1.0",
     "nette/routing": "^3.0",
     "nette/utils": "^3.2.1",

src/Loaders/DatabaseAbstract.php

@@ -34,14 +34,12 @@ public function load(
 			throw new InvalidArgument('Parameter resource must be string.');
 		}
 
-		$content = @file_get_contents($resource); // @ -> prevent E_WARNING and thrown an exception
-
-		if ($content === false) {
+		if (!\is_readable($resource)) {
 			throw new InvalidArgument('Something wrong with resource file "' . $resource . '".');
 		}
 
 		/** @var array<string, string> $settings */
-		$settings = Neon::decode($content);
+		$settings = Neon::decodeFile($resource);
 
 		$settings['table'] = $settings['table'] ?? $domain;
 

src/Loaders/Neon.php

@@ -3,7 +3,7 @@
 namespace Contributte\Translation\Loaders;
 
 use Contributte\Translation\Exceptions\InvalidArgument;
-use Nette;
+use Nette\Neon\Neon as NetteNeon;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\Loader\LoaderInterface;
@@ -27,13 +27,11 @@ public function load(
 			throw new InvalidArgument('Parameter resource must be string.');
 		}
 
-		$content = @file_get_contents($resource); // @ -> prevent E_WARNING and thrown an exception
-
-		if ($content === false) {
+		if (!\is_readable($resource)) {
 			throw new InvalidArgument('Something wrong with resource file "' . $resource . '".');
 		}
 
-		$messages = Nette\Neon\Neon::decode($content);
+		$messages = NetteNeon::decodeFile($resource);
 
 		$catalogue = parent::load($messages ?? [], $locale, $domain);
 

tests/Tests/DI/TranslationExtensionTest.phpt

@@ -162,15 +162,7 @@ final class TranslationExtensionTest extends TestAbstract
 		Assert::count(1, $tracyPanel->getIgnoredResources());
 		Assert::count(1, $panel->getIgnoredResources());
 
-		$foo = $tracyPanel->getIgnoredResources();
-		$foo = end($foo);
-		Assert::same('messages', end($foo));
-		Assert::true(Strings::contains(key($foo), 'messages.cs_CZ.neon'));
-
-		$foo = $panel->getIgnoredResources();
-		$foo = end($foo);
-		Assert::same('messages', end($foo));
-		Assert::true(Strings::contains(key($foo), 'messages.cs_CZ.neon'));
+		Assert::count(2, $panel->getIgnoredResources()['cs_CZ']);
 
 		$symfonyTranslator = $container->getByType(TranslatorInterface::class);
 		Assert::same($translator, $symfonyTranslator);

tests/Tests/TranslatorTest.phpt

@@ -314,7 +314,7 @@ final class TranslatorTest extends TestAbstract
 		Assert::count(1, $dom->find('tr[class="contributte-translation-missing-translation"]'));
 		Assert::count(1, $dom->find('tr[class="contributte-translation-locale-resolvers"]'));
 		Assert::count(4, $dom->find('tr[class="contributte-translation-resources"]'));// lang/another_domain.en_US.neon, lang/messages+intl-icu.en_US.neon, lang/messages.en_US.neon, lang_overloading/messages.en_US.neon
-		Assert::count(1, $dom->find('tr[class="contributte-translation-ignored-resources"]'));// lang/messages.cs_CZ.neon
+		Assert::count(2, $dom->find('tr[class="contributte-translation-ignored-resources"]'));// lang/messages.cs_CZ.neon
 
 		$psrLogger = new class() extends AbstractLogger {
 

tests/lang/file_with_BOM.cs_CZ.neon

@@ -0,0 +1,2 @@
+# comment
+bom: 'BOM'