Merge branch '2.1' into 2.2

weaverryan · weaverryan · commit 07d728d10a7c · 2013-07-28T18:43:47.000-05:00
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
@@ -469,6 +469,8 @@ The subscriber would now look like::
     use Symfony\Component\Form\FormFactoryInterface;
     use Doctrine\ORM\EntityManager;
     use Symfony\Component\Form\FormEvent;
+    use Symfony\Component\Form\FormEvents;
+    use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
     class RegistrationSportListener implements EventSubscriberInterface
     {

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,8 @@ The subscriber would now look like::`
`469`	`469`	`use Symfony\Component\Form\FormFactoryInterface;`
`470`	`470`	`use Doctrine\ORM\EntityManager;`
`471`	`471`	`use Symfony\Component\Form\FormEvent;`
	`472`	`+ use Symfony\Component\Form\FormEvents;`
	`473`	`+ use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`472`	`474`
`473`	`475`	`class RegistrationSportListener implements EventSubscriberInterface`
`474`	`476`	`{`