Commit0b2ceae

committed

Update Doctrine bridge to support the alternative config dir

1 parentf63d407 commit0b2ceaeCopy full SHA for 0b2ceae

File tree

-4

lines changed

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass
- DoctrineValidationPass.php

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,10 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, string`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`$files =$container->getParameter('validator.mapping.loader.'.$mapping.'_files_loader.mapping_files');`
`51`		`-$validationPath ='Resources/config/validation.'.$this->managerType.'.'.$extension;`
	`51`	`+$validationPath ='/config/validation.'.$this->managerType.'.'.$extension;`
`52`	`52`
`53`		`-foreach ($container->getParameter('kernel.bundles')as$bundle) {`
`54`		`-$reflection =new \ReflectionClass($bundle);`
`55`		`-if ($container->fileExists($file =\dirname($reflection->getFileName()).'/'.$validationPath)) {`
	`53`	`+foreach ($container->getParameter('kernel.bundles_metadata')as$bundle) {`
	`54`	`+if ((isset($bundle['dir']) &&$container->fileExists($file =$bundle['dir'].$validationPath)) \|\|$container->fileExists($file =$bundle['path'].$validationPath)) {`
`56`	`55`	`$files[] =$file;`
`57`	`56`	`}`
`58`	`57`	`}`

Comments

(0)