Merge branch '3.4'

* 3.4:
  [Bridge\Doctrine][FrameworkBundle] Deprecate some remaining uses of ContainerAwareTrait
  [FrameworkBundle] Fix bad interface hint in AbstractController
  [VarDumper] deprecate MongoCaster
  [HttpFoundation] deprecate using  with the legacy mongo extension; use it with the mongodb/mongodb package and ext-mongodb instead
  Fix BC layer
  Reset profiler.
  [DI] Improve some deprecation messages
  [DI] remove inheritdoc from dumped container
  [Config] Fix dumped files invalidation by OPCache
  [Security] Add Guard authenticator <supports> method
  [Cache] Fix race condition in TagAwareAdapter
  [DI] Allow setting any public non-initialized services
  [Yaml] parse references on merge keys
  treat trailing backslashes in multi-line strings
  [FrameworkBundle] Expose dotenv in bin/console about
  fix refreshing line numbers for the inline parser
  fix version in changelog
  [FrameworkBundle] Make Controller helpers final
  [DoctrineBridge] Deprecate DbalSessionHandler

Author: nicolas-grekas

Extension/DataCollector/FormDataCollector.php

@@ -74,11 +74,8 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
         }
 
         $this->dataExtractor = $dataExtractor;
-        $this->data = array(
-            'forms' => array(),
-            'forms_by_hash' => array(),
-            'nb_errors' => 0,
-        );
+
+        $this->reset();
     }
 
     /**
@@ -88,6 +85,15 @@ public function collect(Request $request, Response $response, \Exception $except
     {
     }
 
+    public function reset()
+    {
+        $this->data = array(
+            'forms' => array(),
+            'forms_by_hash' => array(),
+            'nb_errors' => 0,
+        );
+    }
+
     /**
      * {@inheritdoc}
      */

Tests/Extension/DataCollector/FormDataCollectorTest.php

@@ -695,6 +695,36 @@ public function testCollectSubmittedDataExpandedFormsErrors()
         $this->assertFalse(isset($child21Data['has_children_error']), 'The leaf data does not contains "has_children_error" property.');
     }
 
+    public function testReset()
+    {
+        $form = $this->createForm('my_form');
+
+        $this->dataExtractor->expects($this->any())
+            ->method('extractConfiguration')
+            ->will($this->returnValue(array()));
+        $this->dataExtractor->expects($this->any())
+            ->method('extractDefaultData')
+            ->will($this->returnValue(array()));
+        $this->dataExtractor->expects($this->any())
+            ->method('extractSubmittedData')
+            ->with($form)
+            ->will($this->returnValue(array('errors' => array('baz'))));
+
+        $this->dataCollector->buildPreliminaryFormTree($form);
+        $this->dataCollector->collectSubmittedData($form);
+
+        $this->dataCollector->reset();
+
+        $this->assertSame(
+            array(
+                'forms' => array(),
+                'forms_by_hash' => array(),
+                'nb_errors' => 0,
+            ),
+            $this->dataCollector->getData()
+        );
+    }
+
     private function createForm($name)
     {
         $builder = new FormBuilder($name, null, $this->dispatcher, $this->factory);