Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit d09611e6d605 · 2017-04-15T16:38:46.000+02:00
* 2.7: Made unmapped field example in forms chapter more descriptive [#7507] fix namespace
diff --git a/forms.rst b/forms.rst
@@ -685,7 +685,8 @@ the choice is ultimately up to you.
         {
             $builder
                 ->add('task')
-                ->add('dueDate', null, array('mapped' => false))
+                ->add('dueDate')
+                ->add('agreeTerms', CheckboxType::class, array('mapped' => false))
                 ->add('save', SubmitType::class)
             ;
         }
@@ -695,11 +696,11 @@ the choice is ultimately up to you.
 
     The field data can be accessed in a controller with::
 
-        $form->get('dueDate')->getData();
+        $form->get('agreeTerms')->getData();
 
     In addition, the data of an unmapped field can also be modified directly::
 
-        $form->get('dueDate')->setData(new \DateTime());
+        $form->get('agreeTerms')->setData(true);
 
 Final Thoughts
 --------------
diff --git a/testing/http_authentication.rst b/testing/http_authentication.rst
@@ -81,7 +81,7 @@ but the following example shows a complete example that you can adapt to your
 needs::
 
     // src/AppBundle/Tests/Controller/DefaultControllerTest.php
-    namespace Appbundle\Tests\Controller;
+    namespace AppBundle\Tests\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
     use Symfony\Component\BrowserKit\Cookie;

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,8 @@ the choice is ultimately up to you.`
`685`	`685`	`{`
`686`	`686`	`$builder`
`687`	`687`	`->add('task')`
`688`		`- ->add('dueDate', null, array('mapped' => false))`
	`688`	`+ ->add('dueDate')`
	`689`	`+ ->add('agreeTerms', CheckboxType::class, array('mapped' => false))`
`689`	`690`	`->add('save', SubmitType::class)`
`690`	`691`	`;`
`691`	`692`	`}`
`@@ -695,11 +696,11 @@ the choice is ultimately up to you.`
`695`	`696`
`696`	`697`	`The field data can be accessed in a controller with::`
`697`	`698`
`698`		`- $form->get('dueDate')->getData();`
	`699`	`+ $form->get('agreeTerms')->getData();`
`699`	`700`
`700`	`701`	`In addition, the data of an unmapped field can also be modified directly::`
`701`	`702`
`702`		`- $form->get('dueDate')->setData(new \DateTime());`
	`703`	`+ $form->get('agreeTerms')->setData(true);`
`703`	`704`
`704`	`705`	`Final Thoughts`
`705`	`706`	`--------------`