fix condition && xml

Raulnet · Raulnet · commit 26048b2eeb24 · 2019-08-01T20:45:12.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1104,7 +1104,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $translator->addMethodCall('setFallbackLocales', [$config['fallbacks']]);
 
         $defaultOptions = $translator->getArgument(4);
-        $defaultOptions['cache_dir'] = empty($config['cache_dir']) ? null : $config['cache_dir'];
+        $defaultOptions['cache_dir'] = $config['cache_dir'];
         $translator->setArgument(4, $defaultOptions);
 
         $container->setParameter('translator.logging', $config['logging']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -185,7 +185,7 @@
         <xsd:attribute name="fallback" type="xsd:string" />
         <xsd:attribute name="logging" type="xsd:boolean" />
         <xsd:attribute name="formatter" type="xsd:string" />
-        <xsd:attribute name="cache_dir" type="xsd:string" use="optional"/>
+        <xsd:attribute name="cache-dir" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="validation">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_cache_dir_disabled.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/translator_cache_dir_disabled.php
@@ -2,6 +2,6 @@
 
 $container->loadFromExtension('framework', [
     'translator' => [
-        'cache_dir' => '',
+        'cache_dir' => null,
     ],
 ]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -26,7 +26,7 @@
             </framework:format>
         </framework:request>
         <framework:assets version="v1" />
-        <framework:translator enabled="true" fallback="fr" logging="true" cache_dir="%kernel.cache_dir%/translations">
+        <framework:translator enabled="true" fallback="fr" logging="true" cache-dir="%kernel.cache_dir%/translations">
             <framework:path>%kernel.project_dir%/Fixtures/translations</framework:path>
         </framework:translator>
         <framework:validation enabled="true" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_cache_dir_disabled.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/translator_cache_dir_disabled.xml
@@ -7,6 +7,6 @@
                         http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
     <framework:config secret="s3cr3t">
-        <framework:translator enabled="true" fallback="fr" logging="true" cache_dir=""/>
+        <framework:translator enabled="true" fallback="fr" logging="true" cache-dir="null" />
     </framework:config>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/translator_cache_dir_disabled.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/translator_cache_dir_disabled.yml
@@ -1,3 +1,3 @@
 framework:
     translator:
-        cache_dir:
+        cache_dir: ~
