Merge branch '4.4'

* 4.4:
  [DI] Dont cache classes with missing parents
  [HttpClient] Fix a crash when calling CurlHttpClient::__destruct()
  Unallow symfony/http-kernel ^5.0
  [FrameworkBundle] fix SodiumVault after stof review
  [HttpClient] allow arbitrary JSON values in requests
  [DependencyInjection] Added option `ignore_errors: not_found` while importing config files
  [Validator] Add the missing translations for the Hebrew (\"he\") locale and fix 2 typos
  [FrameworkBundle][Translation] Invalidate cached catalogues when the scanned directories change

Author: nicolas-grekas

Secrets/SodiumVault.php

@@ -52,7 +52,7 @@ public function generateKeys(bool $override = false): bool
 
         try {
             $this->loadKeys();
-        } catch (\LogicException $e) {
+        } catch (\RuntimeException $e) {
             // ignore failures to load keys
         }
 
@@ -186,7 +186,7 @@ private function loadKeys(): void
         } elseif ('' !== $this->decryptionKey) {
             $this->encryptionKey = sodium_crypto_box_publickey($this->decryptionKey);
         } else {
-            throw new \LogicException(sprintf('Encryption key not found in "%s".', \dirname($this->pathPrefix)));
+            throw new \RuntimeException(sprintf('Encryption key not found in "%s".', \dirname($this->pathPrefix)));
         }
     }
 

Tests/Fixtures/Resources/translations2/ccc.fr.yml

@@ -0,0 +1 @@
+foo: bar

Tests/Translation/TranslatorTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Config\Resource\FileExistenceResource;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Translation\Formatter\MessageFormatter;
+use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Translation\MessageCatalogue;
 
 class TranslatorTest extends TestCase
@@ -206,6 +207,41 @@ public function testCatalogResourcesAreAddedForScannedDirectories()
         $this->assertEquals(new FileExistenceResource('/tmp/I/sure/hope/this/does/not/exist'), $resources[2]);
     }
 
+    public function testCachedCatalogueIsReDumpedWhenScannedDirectoriesChange()
+    {
+        /** @var Translator $translator */
+        $translator = $this->getTranslator(new YamlFileLoader(), [
+            'cache_dir' => $this->tmpDir,
+            'resource_files' => [
+                'fr' => [
+                    __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
+                ],
+            ],
+            'scanned_directories' => [
+                __DIR__.'/../Fixtures/Resources/translations/',
+            ],
+        ], 'yml');
+
+        // Cached catalogue is dumped
+        $this->assertSame('répertoire', $translator->trans('folder', [], 'messages', 'fr'));
+
+        $translator = $this->getTranslator(new YamlFileLoader(), [
+            'cache_dir' => $this->tmpDir,
+            'resource_files' => [
+                'fr' => [
+                    __DIR__.'/../Fixtures/Resources/translations/messages.fr.yml',
+                    __DIR__.'/../Fixtures/Resources/translations2/ccc.fr.yml',
+                ],
+            ],
+            'scanned_directories' => [
+                __DIR__.'/../Fixtures/Resources/translations/',
+                __DIR__.'/../Fixtures/Resources/translations2/',
+            ],
+        ], 'yml');
+
+        $this->assertSame('bar', $translator->trans('foo', [], 'ccc', 'fr'));
+    }
+
     protected function getCatalogue($locale, $messages, $resources = [])
     {
         $catalogue = new MessageCatalogue($locale);

Translation/Translator.php

@@ -82,7 +82,9 @@ public function __construct(ContainerInterface $container, MessageFormatterInter
         $this->resourceFiles = $this->options['resource_files'];
         $this->scannedDirectories = $this->options['scanned_directories'];
 
-        parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug']);
+        parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug'], [
+            'scanned_directories' => $this->scannedDirectories,
+        ]);
     }
 
     /**