embed resource name in error message

xabbuh · xabbuh · commit 507a5963e429 · 2020-05-15T09:32:03.000+02:00
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Translation\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\Exception\RuntimeException;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Translator;
@@ -552,6 +553,16 @@ public function testTransChoiceFallbackWithNoTranslation()
         // unchanged if it can't be found
         $this->assertEquals('some_message2', $translator->transChoice('some_message2', 10, ['%count%' => 10]));
     }
+
+    public function testMissingLoaderForResourceError()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('No loader is registered for the "twig" format when loading the "messages.en.twig" resource.');
+
+        $translator = new Translator('en');
+        $translator->addResource('twig', 'messages.en.twig', 'en');
+        $translator->getCatalogue('en');
+    }
 }
 
 class StringClass
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -376,7 +376,11 @@ private function doLoadCatalogue($locale)
         if (isset($this->resources[$locale])) {
             foreach ($this->resources[$locale] as $resource) {
                 if (!isset($this->loaders[$resource[0]])) {
-                    throw new RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
+                    if (\is_string($resource[1])) {
+                        throw new RuntimeException(sprintf('No loader is registered for the "%s" format when loading the "%s" resource.', $resource[0], $resource[1]));
+                    }
+
+                    throw new RuntimeException(sprintf('No loader is registered for the "%s" format.', $resource[0]));
                 }
                 $this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
             }

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,11 @@ private function doLoadCatalogue($locale)`
`376`	`376`	`if (isset($this->resources[$locale])) {`
`377`	`377`	`foreach ($this->resources[$locale] as $resource) {`
`378`	`378`	`if (!isset($this->loaders[$resource[0]])) {`
`379`		`- throw new RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));`
	`379`	`+ if (\is_string($resource[1])) {`
	`380`	`+ throw new RuntimeException(sprintf('No loader is registered for the "%s" format when loading the "%s" resource.', $resource[0], $resource[1]));`
	`381`	`+ }`
	`382`	`+`
	`383`	`+ throw new RuntimeException(sprintf('No loader is registered for the "%s" format.', $resource[0]));`
`380`	`384`	`}`
`381`	`385`	`$this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));`
`382`	`386`	`}`