diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 6ad4cb5b9d01c..8537497d6a4b7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1177,7 +1177,10 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
$dirname = $bundle['path'];
- if ($container->fileExists($file = $dirname.'/Resources/config/validation.yml', false)) {
+ if (
+ $container->fileExists($file = $dirname.'/Resources/config/validation.yaml', false) ||
+ $container->fileExists($file = $dirname.'/Resources/config/validation.yml', false)
+ ) {
$fileRecorder('yml', $file);
}
@@ -1385,7 +1388,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
$fileRecorder('xml', $file);
}
- if ($container->fileExists($file = $dirname.'/Resources/config/serialization.yml', false)) {
+ if (
+ $container->fileExists($file = $dirname.'/Resources/config/serialization.yaml', false) ||
+ $container->fileExists($file = $dirname.'/Resources/config/serialization.yml', false)
+ ) {
$fileRecorder('yml', $file);
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
index 4f8999d0cb647..cd0a983010c8a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
@@ -33,7 +33,7 @@
-
+
@@ -92,6 +92,11 @@
+
+ yaml
+
+
+
diff --git a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
index fdd113b103654..ecf00fa64ba92 100644
--- a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
@@ -23,6 +23,13 @@
*/
class YamlFileDumper extends FileDumper
{
+ private $extension;
+
+ public function __construct(/**string */$extension = 'yml')
+ {
+ $this->extension = $extension;
+ }
+
/**
* {@inheritdoc}
*/
@@ -50,6 +57,6 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
*/
protected function getExtension()
{
- return 'yml';
+ return $this->extension;
}
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy