Reset profiler.

Author: derrabus

DataCollector/ValidatorDataCollector.php

@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Validator\TraceableValidator;
 use Symfony\Component\VarDumper\Caster\Caster;
 use Symfony\Component\VarDumper\Caster\ClassStub;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
@@ -31,10 +32,7 @@ class ValidatorDataCollector extends DataCollector implements LateDataCollectorI
     public function __construct(TraceableValidator $validator)
     {
         $this->validator = $validator;
-        $this->data = array(
-            'calls' => array(),
-            'violations_count' => 0,
-        );
+        $this->reset();
     }
 
     /**
@@ -45,23 +43,38 @@ public function collect(Request $request, Response $response, \Exception $except
         // Everything is collected once, on kernel terminate.
     }
 
+    public function reset()
+    {
+        $this->validator->reset();
+        $this->data = array(
+            'calls' => $this->cloneVar(array()),
+            'violations_count' => 0,
+        );
+    }
+
     /**
      * {@inheritdoc}
      */
     public function lateCollect()
     {
         $collected = $this->validator->getCollectedData();
         $this->data['calls'] = $this->cloneVar($collected);
-        $this->data['violations_count'] += array_reduce($collected, function ($previous, $item) {
-            return $previous += count($item['violations']);
+        $this->data['violations_count'] = array_reduce($collected, function ($previous, $item) {
+            return $previous + count($item['violations']);
         }, 0);
     }
 
+    /**
+     * @return Data
+     */
     public function getCalls()
     {
         return $this->data['calls'];
     }
 
+    /**
+     * @return int
+     */
     public function getViolationsCount()
     {
         return $this->data['violations_count'];

Tests/DataCollector/ValidatorDataCollectorTest.php

@@ -50,6 +50,33 @@ public function testCollectsValidatorCalls()
         $this->assertCount(2, $call['violations']);
     }
 
+    public function testReset()
+    {
+        $originalValidator = $this->createMock(ValidatorInterface::class);
+        $validator = new TraceableValidator($originalValidator);
+
+        $collector = new ValidatorDataCollector($validator);
+
+        $violations = new ConstraintViolationList(array(
+            $this->createMock(ConstraintViolation::class),
+            $this->createMock(ConstraintViolation::class),
+        ));
+        $originalValidator->method('validate')->willReturn($violations);
+
+        $validator->validate(new \stdClass());
+
+        $collector->lateCollect();
+        $collector->reset();
+
+        $this->assertCount(0, $collector->getCalls());
+        $this->assertSame(0, $collector->getViolationsCount());
+
+        $collector->lateCollect();
+
+        $this->assertCount(0, $collector->getCalls());
+        $this->assertSame(0, $collector->getViolationsCount());
+    }
+
     protected function createMock($classname)
     {
         return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock();

Validator/TraceableValidator.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Validator\Validator;
 
-use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
@@ -30,13 +29,18 @@ public function __construct(ValidatorInterface $validator)
     }
 
     /**
-     * @return ConstraintViolationList[]
+     * @return array
      */
     public function getCollectedData()
     {
         return $this->collectedData;
     }
 
+    public function reset()
+    {
+        $this->collectedData = array();
+    }
+
     /**
      * {@inheritdoc}
      */