[FrameworkBundle] Allow .yaml file extension everywhere

ogizanagi · ogizanagi · commit 2940bb0d2cc2 · 2017-06-16T12:53:40.000+02:00
diff --git 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
@@ -33,7 +33,7 @@
         </service>
 
         <service id="translation.loader.yml" class="Symfony\Component\Translation\Loader\YamlFileLoader" public="true">
-            <tag name="translation.loader" alias="yml" />
+            <tag name="translation.loader" alias="yaml" legacy-alias="yml" />
         </service>
 
         <service id="translation.loader.xliff" class="Symfony\Component\Translation\Loader\XliffFileLoader" public="true">
@@ -92,6 +92,11 @@
             <tag name="translation.dumper" alias="yml" />
         </service>
 
+        <service id="translation.dumper.yaml" class="Symfony\Component\Translation\Dumper\YamlFileDumper">
+            <argument>yaml</argument>
+            <tag name="translation.dumper" alias="yaml" />
+        </service>
+
         <service id="translation.dumper.qt" class="Symfony\Component\Translation\Dumper\QtFileDumper" public="true">
             <tag name="translation.dumper" alias="ts" />
         </service>
diff --git 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;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1177,7 +1177,10 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co`
`1177`	`1177`	`foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {`
`1178`	`1178`	`$dirname = $bundle['path'];`
`1179`	`1179`
`1180`		`- if ($container->fileExists($file = $dirname.'/Resources/config/validation.yml', false)) {`
	`1180`	`+ if (`
	`1181`	`+ $container->fileExists($file = $dirname.'/Resources/config/validation.yaml', false) \|\|`
	`1182`	`+ $container->fileExists($file = $dirname.'/Resources/config/validation.yml', false)`
	`1183`	`+ ) {`
`1181`	`1184`	`$fileRecorder('yml', $file);`
`1182`	`1185`	`}`
`1183`	`1186`
`@@ -1385,7 +1388,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1385`	`1388`	`$fileRecorder('xml', $file);`
`1386`	`1389`	`}`
`1387`	`1390`
`1388`		`- if ($container->fileExists($file = $dirname.'/Resources/config/serialization.yml', false)) {`
	`1391`	`+ if (`
	`1392`	`+ $container->fileExists($file = $dirname.'/Resources/config/serialization.yaml', false) \|\|`
	`1393`	`+ $container->fileExists($file = $dirname.'/Resources/config/serialization.yml', false)`
	`1394`	`+ ) {`
`1389`	`1395`	`$fileRecorder('yml', $file);`
`1390`	`1396`	`}`
`1391`	`1397`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,13 @@`
`23`	`23`	`*/`
`24`	`24`	`class YamlFileDumper extends FileDumper`
`25`	`25`	`{`
	`26`	`+ private $extension;`
	`27`	`+`
	`28`	`+ public function __construct(/*string /$extension = 'yml')`
	`29`	`+ {`
	`30`	`+ $this->extension = $extension;`
	`31`	`+ }`
	`32`	`+`
`26`	`33`	`/**`
`27`	`34`	`* {@inheritdoc}`
`28`	`35`	`*/`
`@@ -50,6 +57,6 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti`
`50`	`57`	`*/`
`51`	`58`	`protected function getExtension()`
`52`	`59`	`{`
`53`		`- return 'yml';`
	`60`	`+ return $this->extension;`
`54`	`61`	`}`
`55`	`62`	`}`