From bc9817c85e165dd8ba6685b445bb4ad0c06120ad Mon Sep 17 00:00:00 2001
From: Tobias Naumann <tna@netz3.ch>
Date: Sun, 24 Apr 2011 00:59:43 +0200
Subject: [PATCH] [Form] Added FieldTypeValidatorExtension and fixed FQCN of
 DelegatingValidator

---
 .../Bundle/FrameworkBundle/Resources/config/form.xml      | 8 +++++++-
 .../Component/Form/Resources/config/validation.xml        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index dd6b841f3f..907d9bb0a8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -21,7 +21,7 @@
                 <!--
                 We don't need to be able to add more extensions.
                  * more types can be registered with the form.type tag
-                 * more type_guessers can be registered with the form.type.type_guesser tag 
+                 * more type_guessers can be registered with the form.type.type_guesser tag
                 -->
                 <argument type="service" id="form.extension" />
             </argument>
@@ -148,6 +148,12 @@
             <tag name="form.type" alias="url" />
         </service>
 
+        <!-- FieldTypeValidatorExtension -->
+        <service id="form.type_extension.field" class="Symfony\Component\Form\Extension\Validator\Type\FieldTypeValidatorExtension">
+            <tag name="form.type_extension" alias="field" />
+            <argument type="service" id="validator" />
+        </service>
+
         <!-- CsrfExtension -->
         <service id="form.type.csrf" class="Symfony\Component\Form\Extension\Csrf\Type\CsrfType">
             <tag name="form.type" alias="csrf" />
diff --git a/src/Symfony/Component/Form/Resources/config/validation.xml b/src/Symfony/Component/Form/Resources/config/validation.xml
index aa28ea6876..5512560c6d 100644
--- a/src/Symfony/Component/Form/Resources/config/validation.xml
+++ b/src/Symfony/Component/Form/Resources/config/validation.xml
@@ -7,7 +7,7 @@
   <class name="Symfony\Component\Form\Form">
     <constraint name="Callback">
       <value>
-        <value>Symfony\Component\Form\Extension\Core\Validator\DelegatingValidator</value>
+        <value>Symfony\Component\Form\Extension\Validator\Validator\DelegatingValidator</value>
         <value>validateFormData</value>
       </value>
     </constraint>