feature #20547 [FrameworkBundle] Allowed symlinks when searching for translation, searialization and validation files (tifabien)

fabpot · fabpot · commit 6f6100a8e170 · 2017-01-06T07:23:52.000-08:00
This PR was squashed before being merged into the 3.3-dev branch (closes #20547). Discussion ---------- [FrameworkBundle] Allowed symlinks when searching for translation, searialization and validation files | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When we have a symlink folder in app/Resources/translations, files inside this symlink are not handled. Commits ------- 4874e43 [FrameworkBundle] Allowed symlinks when searching for translation, searialization and validation files
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -893,6 +893,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
             $files = array();
             $finder = Finder::create()
+                ->followLinks()
                 ->files()
                 ->filter(function (\SplFileInfo $file) {
                     return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());
@@ -1004,10 +1005,10 @@ private function getValidatorMappingFiles(ContainerBuilder $container)
             }
 
             if (is_dir($dir = $dirname.'/Resources/config/validation')) {
-                foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
+                foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.xml') as $file) {
                     $files[0][] = $file->getPathname();
                 }
-                foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
+                foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.yml') as $file) {
                     $files[1][] = $file->getPathname();
                 }
 
@@ -1187,13 +1188,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             }
 
             if (is_dir($dir = $dirname.'/Resources/config/serialization')) {
-                foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {
+                foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.xml') as $file) {
                     $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getPathname()));
                     $definition->setPublic(false);
 
                     $serializerLoaders[] = $definition;
                 }
-                foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {
+                foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.yml') as $file) {
                     $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getPathname()));
                     $definition->setPublic(false);
 

Original file line number	Diff line number	Diff line change
`@@ -893,6 +893,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`893`	`893`
`894`	`894`	`$files = array();`
`895`	`895`	`$finder = Finder::create()`
	`896`	`+ ->followLinks()`
`896`	`897`	`->files()`
`897`	`898`	`->filter(function (\SplFileInfo $file) {`
`898`	`899`	`return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());`
`@@ -1004,10 +1005,10 @@ private function getValidatorMappingFiles(ContainerBuilder $container)`
`1004`	`1005`	`}`
`1005`	`1006`
`1006`	`1007`	`if (is_dir($dir = $dirname.'/Resources/config/validation')) {`
`1007`		`- foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {`
	`1008`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.xml') as $file) {`
`1008`	`1009`	`$files[0][] = $file->getPathname();`
`1009`	`1010`	`}`
`1010`		`- foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {`
	`1011`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.yml') as $file) {`
`1011`	`1012`	`$files[1][] = $file->getPathname();`
`1012`	`1013`	`}`
`1013`	`1014`
`@@ -1187,13 +1188,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`1187`	`1188`	`}`
`1188`	`1189`
`1189`	`1190`	`if (is_dir($dir = $dirname.'/Resources/config/serialization')) {`
`1190`		`- foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {`
	`1191`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.xml') as $file) {`
`1191`	`1192`	`$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getPathname()));`
`1192`	`1193`	`$definition->setPublic(false);`
`1193`	`1194`
`1194`	`1195`	`$serializerLoaders[] = $definition;`
`1195`	`1196`	`}`
`1196`		`- foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {`
	`1197`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.yml') as $file) {`
`1197`	`1198`	`$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getPathname()));`
`1198`	`1199`	`$definition->setPublic(false);`
`1199`	`1200`