From 158a41960ffd970affa624b4085a92071215561d Mon Sep 17 00:00:00 2001 From: Fabien Lucas Date: Thu, 17 Nov 2016 10:41:17 +0100 Subject: [PATCH 1/2] [FrameworkBundle] Fix Finder when searching for translation files with symlinks. --- .../FrameworkBundle/DependencyInjection/FrameworkExtension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 278b8b9b7d672..9a1efd7145c3a 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()); From d2c974f6185155caa1f21ec6468801aafa7c7c66 Mon Sep 17 00:00:00 2001 From: Fabien Lucas Date: Thu, 17 Nov 2016 17:23:49 +0100 Subject: [PATCH 2/2] Add followLinks in Finder for validation and serialization file --- .../DependencyInjection/FrameworkExtension.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 9a1efd7145c3a..caf891e2a82f7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -822,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(); } @@ -943,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);