Merge branch '2.8' into 3.0

xabbuh · xabbuh · commit 03c660578b8c · 2016-02-01T16:23:20.000+01:00
* 2.8:
  fix types
  Revert "revert form login CSRF changes on wrong branch"
  revert form login CSRF changes on wrong branch
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
@@ -52,7 +52,7 @@ The simplest ``TypeTestCase`` implementation looks like the following::
                 'test2' => 'test2',
             );
 
-            $type = new TestedType();
+            $type = TestedType::class;
             $form = $this->factory->create($type);
 
             $object = TestObject::fromArray($formData);
@@ -78,7 +78,7 @@ First you verify if the ``FormType`` compiles. This includes basic class
 inheritance, the ``buildForm`` function and options resolution. This should
 be the first test you write::
 
-    $type = new TestedType();
+    $type = TestedType::class;
     $form = $this->factory->create($type);
 
 This test checks that none of your data transformers used by the form
@@ -139,7 +139,7 @@ before creating the parent form using the ``PreloadedExtension`` class::
     {
         protected function getExtensions()
         {
-            $childType = new TestChildType();
+            $childType = TestChildType::class;
 
             return array(new PreloadedExtension(array(
                 $childType->getName() => $childType,
@@ -148,7 +148,7 @@ before creating the parent form using the ``PreloadedExtension`` class::
 
         public function testSubmitValidData()
         {
-            $type = new TestedType();
+            $type = TestedType::class;
             $form = $this->factory->create($type);
 
             // ... your test
