Fix tests

welcoMattic · welcoMattic · commit 5beef58bc4df · 2020-07-01T14:50:51.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -81,6 +81,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'translation.dumper',
         'translation.extractor',
         'translation.loader',
+        'translation.remote_factory',
         'twig.extension',
         'twig.loader',
         'twig.runtime',
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1099,6 +1099,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         if (!$this->isConfigEnabled($container, $config)) {
             $container->removeDefinition('console.command.translation_debug');
             $container->removeDefinition('console.command.translation_update');
+            $container->removeDefinition('console.command.translation_pull');
+            $container->removeDefinition('console.command.translation_push');
 
             return;
         }
@@ -1165,6 +1167,42 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             $container->getDefinition('console.command.translation_update')->replaceArgument(6, $transPaths);
         }
 
+        if (!empty($config['remotes'])) {
+            if (empty($config['enabled_locales'])) {
+                throw new LogicException('You must specify framework.translator.enabled_locales in order to use remotes.');
+            }
+
+            if ($container->hasDefinition('console.command.translation_pull')) {
+                $container->getDefinition('console.command.translation_pull')
+                    ->replaceArgument(5, $transPaths)
+                    ->replaceArgument(6, $config['enabled_locales'])
+                ;
+            }
+
+            if ($container->hasDefinition('console.command.translation_push')) {
+                $container->getDefinition('console.command.translation_push')
+                    ->replaceArgument(3, $transPaths)
+                    ->replaceArgument(4, $config['enabled_locales'])
+                ;
+            }
+
+            $container->getDefinition('translation.remotes_factory')
+                ->replaceArgument(1, $config['enabled_locales'])
+            ;
+
+            $container->getDefinition('translation.remotes')->setArgument(0, $config['remotes']);
+
+            $classToServices = [
+                LocoRemoteFactory::class => 'translation.remote_factory.loco',
+            ];
+
+            foreach ($classToServices as $class => $service) {
+                if (!class_exists($class)) {
+                    $container->removeDefinition($service);
+                }
+            }
+        }
+
         if ($container->fileExists($defaultDir)) {
             $dirs[] = $defaultDir;
         } else {
@@ -1211,42 +1249,6 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
             $translator->replaceArgument(4, $options);
         }
-
-        if (!empty($config['remotes'])) {
-            if (empty($config['enabled_locales'])) {
-                throw new LogicException('You must specify framework.translator.enabled_locales in order to use remotes.');
-            }
-
-            if ($container->hasDefinition('console.command.translation_pull')) {
-                $container->getDefinition('console.command.translation_pull')
-                    ->replaceArgument(5, $transPaths)
-                    ->replaceArgument(6, $config['enabled_locales'])
-                ;
-            }
-
-            if ($container->hasDefinition('console.command.translation_push')) {
-                $container->getDefinition('console.command.translation_push')
-                    ->replaceArgument(3, $transPaths)
-                    ->replaceArgument(4, $config['enabled_locales'])
-                ;
-            }
-
-            $container->getDefinition('translation.remotes_factory')
-                ->replaceArgument(1, $config['enabled_locales'])
-            ;
-
-            $container->getDefinition('translation.remotes')->setArgument(0, $config['remotes']);
-
-            $classToServices = [
-                LocoRemoteFactory::class => 'translation.remote_factory.loco',
-            ];
-
-            foreach ($classToServices as $class => $service) {
-                if (!class_exists($class)) {
-                    $container->removeDefinition($service);
-                }
-            }
-        }
     }
 
     private function registerValidationConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $propertyInfoEnabled)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_remotes.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_remotes.php
@@ -25,7 +25,9 @@
             ->abstract()
 
         ->set('translation.remote_factory.loco', LocoRemoteFactory::class)
-            ->args([service('translator.data_collector')])
+            ->args([
+                service('translator.data_collector')->nullOnInvalid()
+            ])
             ->parent('translation.remote_factory.abstract')
             ->tag('translation.remote_factory')
     ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -378,6 +378,7 @@ protected static function getBundleDefaultConfig()
                 'paths' => [],
                 'default_path' => '%kernel.project_dir%/translations',
                 'enabled_locales' => [],
+                'remotes' => [],
             ],
             'validation' => [
                 'enabled' => !class_exists(FullStack::class),
