From c104bc291a2b691abd4408f8d5f9595c93a689ae Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 9 Jul 2015 18:32:09 +0200
Subject: [PATCH] fixed merge

---
 .../DependencyInjection/FrameworkExtension.php         | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index ded218e3f7..2183004d85 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -820,15 +820,7 @@ class FrameworkExtension extends Extension
                     $files[1][] = $file->getRealpath();
                 }
 
-<<<<<<< HEAD
                 $container->addResource(new DirectoryResource($dir));
-=======
-        foreach ($container->getParameter('kernel.bundles') as $bundle) {
-            $reflection = new \ReflectionClass($bundle);
-            if (is_file($file = dirname($reflection->getFileName()).'/Resources/config/validation.yml')) {
-                $files[] = realpath($file);
-                $container->addResource(new FileResource($file));
->>>>>>> 2.6
             }
         }
 
@@ -923,7 +915,7 @@ class FrameworkExtension extends Extension
         $bundles = $container->getParameter('kernel.bundles');
         foreach ($bundles as $bundle) {
             $reflection = new \ReflectionClass($bundle);
-            $dirname = dirname($reflection->getFilename());
+            $dirname = dirname($reflection->getFileName());
 
             if (is_file($file = $dirname.'/Resources/config/serialization.xml')) {
                 $definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array(realpath($file)));