Merge pull request #1525 from ousmaneNdiaye/FixErrorDoc

stof · stof · commit ba3e09980f34 · 2014-07-04T16:20:21.000+02:00
Fixed error : AcmeUserBundle should be compatible with FOS\UserBundle...
diff --git a/Resources/doc/overriding_controllers.md b/Resources/doc/overriding_controllers.md
@@ -57,10 +57,11 @@ namespace Acme\UserBundle\Controller;
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use FOS\UserBundle\Controller\RegistrationController as BaseController;
+use Symfony\Component\HttpFoundation\Request;
 
 class RegistrationController extends BaseController
 {
-    public function registerAction()
+    public function registerAction(Request $request)
     {
         $form = $this->container->get('fos_user.registration.form');
         $formHandler = $this->container->get('fos_user.registration.form.handler');

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,11 @@ namespace Acme\UserBundle\Controller;`
`57`	`57`
`58`	`58`	`use Symfony\Component\HttpFoundation\RedirectResponse;`
`59`	`59`	`use FOS\UserBundle\Controller\RegistrationController as BaseController;`
	`60`	`+use Symfony\Component\HttpFoundation\Request;`
`60`	`61`
`61`	`62`	`class RegistrationController extends BaseController`
`62`	`63`	`{`
`63`		`- public function registerAction()`
	`64`	`+ public function registerAction(Request $request)`
`64`	`65`	`{`
`65`	`66`	`$form = $this->container->get('fos_user.registration.form');`
`66`	`67`	`$formHandler = $this->container->get('fos_user.registration.form.handler');`