symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎
Lines changed: 8 additions & 4 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/validator/foo.xml‎ b/‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/validator/foo.xml‎
@@ -1020,6 +1020,11 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
             }
         }
 
+        $projectDir = $container->getParameter('kernel.project_dir');
+        if ($container->fileExists($dir = $projectDir.'/config/validator', '/^$/')) {
+            $this->registerMappingFilesFromDir($dir, $fileRecorder);
+        }
+
         $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);
     }
 
 
@@ -536,9 +536,13 @@ public function testTemplatingRequiresAtLeastOneEngine()
     public function testValidation()
     {
         $container = $this->createContainerFromFile('full');
+        $projectDir = $container->getParameter('kernel.project_dir');
 
         $ref = new \ReflectionClass('Symfony\Component\Form\Form');
-        $xmlMappings = array(dirname($ref->getFileName()).'/Resources/config/validation.xml');
+        $xmlMappings = array(
+            dirname($ref->getFileName()).'/Resources/config/validation.xml',
+            str_replace('/', DIRECTORY_SEPARATOR, $projectDir.'/config/validator/foo.xml'),
+        );
 
         $calls = $container->getDefinition('validator.builder')->getMethodCalls();
 
@@ -626,7 +630,7 @@ public function testValidationPaths()
         $this->assertEquals(array(new Reference('validator.mapping.cache.symfony')), $calls[7][1]);
 
         $xmlMappings = $calls[3][1][0];
-        $this->assertCount(2, $xmlMappings);
+        $this->assertCount(3, $xmlMappings);
         try {
             // Testing symfony/symfony
             $this->assertStringEndsWith('Component'.DIRECTORY_SEPARATOR.'Form/Resources/config/validation.xml', $xmlMappings[0]);
@@ -652,7 +656,7 @@ public function testValidationPathsUsingCustomBundlePath()
 
         $calls = $container->getDefinition('validator.builder')->getMethodCalls();
         $xmlMappings = $calls[3][1][0];
-        $this->assertCount(2, $xmlMappings);
+        $this->assertCount(3, $xmlMappings);
 
         try {
             // Testing symfony/symfony
@@ -694,7 +698,7 @@ public function testValidationMapping()
         $calls = $container->getDefinition('validator.builder')->getMethodCalls();
 
         $this->assertSame('addXmlMappings', $calls[3][0]);
-        $this->assertCount(2, $calls[3][1][0]);
+        $this->assertCount(3, $calls[3][1][0]);
 
         $this->assertSame('addYamlMappings', $calls[4][0]);
         $this->assertCount(3, $calls[4][1][0]);
Original file line number	Diff line number	Diff line change
`@@ -1020,6 +1020,11 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co`
`1020`	`1020`	`}`
`1021`	`1021`	`}`
`1022`	`1022`
	`1023`	`+ $projectDir = $container->getParameter('kernel.project_dir');`
	`1024`	`+ if ($container->fileExists($dir = $projectDir.'/config/validator', '/^$/')) {`
	`1025`	`+ $this->registerMappingFilesFromDir($dir, $fileRecorder);`
	`1026`	`+ }`
	`1027`	`+`
`1023`	`1028`	`$this->registerMappingFilesFromConfig($container, $config, $fileRecorder);`
`1024`	`1029`	`}`
`1025`	`1030`