diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
Fabien Potencier 2015-07-09 18:32:09 +02:00
parent 175af7f3ac
commit c104bc291a
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -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)));