fixed merge
This commit is contained in:
parent
175af7f3ac
commit
c104bc291a
@ -820,15 +820,7 @@ class FrameworkExtension extends Extension
|
|||||||
$files[1][] = $file->getRealpath();
|
$files[1][] = $file->getRealpath();
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
$container->addResource(new DirectoryResource($dir));
|
$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');
|
$bundles = $container->getParameter('kernel.bundles');
|
||||||
foreach ($bundles as $bundle) {
|
foreach ($bundles as $bundle) {
|
||||||
$reflection = new \ReflectionClass($bundle);
|
$reflection = new \ReflectionClass($bundle);
|
||||||
$dirname = dirname($reflection->getFilename());
|
$dirname = dirname($reflection->getFileName());
|
||||||
|
|
||||||
if (is_file($file = $dirname.'/Resources/config/serialization.xml')) {
|
if (is_file($file = $dirname.'/Resources/config/serialization.xml')) {
|
||||||
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array(realpath($file)));
|
$definition = new Definition('Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader', array(realpath($file)));
|
||||||
|
Reference in New Issue
Block a user