merged branch henrikbjorn/2.0 (PR symfony#3133)

fabpot · fabpot · commit 706020b38a34 · 2012-01-17T10:54:23.000+01:00
Commits ------- 959614b Use reflection to determaine the correct path for component validation.xml file Discussion ---------- 2.0 Validation.xml use reflection to guess path
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -554,7 +554,8 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
     private function getValidatorXmlMappingFiles(ContainerBuilder $container)
     {
-        $files = array(__DIR__.'/../../../Component/Form/Resources/config/validation.xml');
+        $reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
+        $files = array(dirname($reflClass->getFileName()) . '/Resources/config/validation.xml');
         $container->addResource(new FileResource($files[0]));
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,8 @@ private function registerValidationConfiguration(array $config, ContainerBuilder`
`554`	`554`
`555`	`555`	`private function getValidatorXmlMappingFiles(ContainerBuilder $container)`
`556`	`556`	`{`
`557`		`- $files = array(__DIR__.'/../../../Component/Form/Resources/config/validation.xml');`
	`557`	`+ $reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');`
	`558`	`+ $files = array(dirname($reflClass->getFileName()) . '/Resources/config/validation.xml');`
`558`	`559`	`$container->addResource(new FileResource($files[0]));`
`559`	`560`
`560`	`561`	`foreach ($container->getParameter('kernel.bundles') as $bundle) {`