bug #24770 [Validator] Fix TraceableValidator is reset on data collector instantiation (ogizanagi)

fabpot · fabpot · commit 782dc947dc0f · 2017-10-31T10:50:48.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [Validator] Fix TraceableValidator is reset on data collector instantiation | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | N/A  | License | MIT | Doc PR | N/A Calling reset from the constructor is wrong in this case as it'll reset the `TraceableValidator`, which means you'll never get collected data on the first request as the collector is instantiated after (on kernel response). Another option would be to tag the `debug.validator` service with `kernel.reset` and remove the reset call from the collector. Commits ------- f5855fb [Validator] Fix TraceableValidator is reset on data collector instantiation
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator_debug.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator_debug.xml
@@ -9,6 +9,7 @@
 
         <service id="debug.validator" decorates="validator" decoration-priority="255" class="Symfony\Component\Validator\Validator\TraceableValidator">
             <argument type="service" id="debug.validator.inner" />
+            <tag name="kernel.reset" method="reset" />
         </service>
 
         <!-- DataCollector -->
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -45,7 +45,6 @@ public function collect(Request $request, Response $response, \Exception $except
 
     public function reset()
     {
-        $this->validator->reset();
         $this->data = array(
             'calls' => $this->cloneVar(array()),
             'violations_count' => 0,
diff --git a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
@@ -70,11 +70,6 @@ public function testReset()
 
         $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)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ public function collect(Request $request, Response $response, \Exception $except`
`45`	`45`
`46`	`46`	`public function reset()`
`47`	`47`	`{`
`48`		`- $this->validator->reset();`
`49`	`48`	`$this->data = array(`
`50`	`49`	`'calls' => $this->cloneVar(array()),`
`51`	`50`	`'violations_count' => 0,`