[FrameworkBundle] Allowed symlinks when searching for translation, searialization and validation files

tifabien · fabpot · commit 4874e43a4ca0 · 2017-01-06T07:23:44.000-08:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -713,6 +713,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());
@@ -821,10 +822,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();
                 }
 
@@ -942,13 +943,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
`@@ -713,6 +713,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`713`	`713`
`714`	`714`	`$files = array();`
`715`	`715`	`$finder = Finder::create()`
	`716`	`+ ->followLinks()`
`716`	`717`	`->files()`
`717`	`718`	`->filter(function (\SplFileInfo $file) {`
`718`	`719`	`return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());`
`@@ -821,10 +822,10 @@ private function getValidatorMappingFiles(ContainerBuilder $container)`
`821`	`822`	`}`
`822`	`823`
`823`	`824`	`if (is_dir($dir = $dirname.'/Resources/config/validation')) {`
`824`		`- foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {`
	`825`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.xml') as $file) {`
`825`	`826`	`$files[0][] = $file->getPathname();`
`826`	`827`	`}`
`827`		`- foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {`
	`828`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.yml') as $file) {`
`828`	`829`	`$files[1][] = $file->getPathname();`
`829`	`830`	`}`
`830`	`831`
`@@ -942,13 +943,13 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder`
`942`	`943`	`}`
`943`	`944`
`944`	`945`	`if (is_dir($dir = $dirname.'/Resources/config/serialization')) {`
`945`		`- foreach (Finder::create()->files()->in($dir)->name('*.xml') as $file) {`
	`946`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.xml') as $file) {`
`946`	`947`	`$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array($file->getPathname()));`
`947`	`948`	`$definition->setPublic(false);`
`948`	`949`
`949`	`950`	`$serializerLoaders[] = $definition;`
`950`	`951`	`}`
`951`		`- foreach (Finder::create()->files()->in($dir)->name('*.yml') as $file) {`
	`952`	`+ foreach (Finder::create()->followLinks()->files()->in($dir)->name('*.yml') as $file) {`
`952`	`953`	`$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader', array($file->getPathname()));`
`953`	`954`	`$definition->setPublic(false);`
`954`	`955`