From 4874e43a4ca01ce3353d903150f310d65be7ed69 Mon Sep 17 00:00:00 2001 From: Fabien Lucas Date: Thu, 17 Nov 2016 10:41:17 +0100 Subject: [PATCH] [FrameworkBundle] Allowed symlinks when searching for translation, searialization and validation files --- .../DependencyInjection/FrameworkExtension.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 278b8b9b7d67..caf891e2a82f 100644 --- 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);