minor #23517 [Profiler][Validator] ValidatorDataCollector: use new DataCollector::getCasters() method (ogizanagi)

fabpot · fabpot · commit aa27974920cc · 2017-07-17T12:35:31.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Profiler][Validator] ValidatorDataCollector: use new DataCollector::getCasters() method | Q | A | ------------- | --- | Branch? | 3.4  | Bug fix? | no | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #23465 (comment)  | License | MIT | Doc PR | N/A ~~First commit targets 3.3; see #23516 I didn't re-used the `ConstraintViolationInterface` caster used in the form collector, as it's the purpose of the validator collector to show the constraints data. Commits ------- c725a70 [Profiler][Validator] ValidatorDataCollector: use new DataCollector::getCasters() method
diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php
@@ -19,16 +19,14 @@
 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\VarCloner;
+use Symfony\Component\VarDumper\Cloner\Stub;
 
 /**
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
  */
 class ValidatorDataCollector extends DataCollector implements LateDataCollectorInterface
 {
     private $validator;
-    private $cloner;
 
     public function __construct(TraceableValidator $validator)
     {
@@ -77,29 +75,26 @@ public function getName()
         return 'validator';
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function cloneVar($var)
+    protected function getCasters()
     {
-        if ($var instanceof Data) {
-            return $var;
-        }
+        return parent::getCasters() + array(
+            \Exception::class => function (\Exception $e, array $a, Stub $s) {
+                foreach (array("\0Exception\0previous", "\0Exception\0trace") as $k) {
+                    if (isset($a[$k])) {
+                        unset($a[$k]);
+                        ++$s->cut;
+                    }
+                }
 
-        if (null === $this->cloner) {
-            $this->cloner = new VarCloner();
-            $this->cloner->setMaxItems(-1);
-            $this->cloner->addCasters(array(
-                FormInterface::class => function (FormInterface $f, array $a) {
-                    return array(
-                        Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
-                        Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(get_class($f->getConfig()->getType()->getInnerType())),
-                        Caster::PREFIX_VIRTUAL.'data' => $f->getData(),
-                    );
-                },
-            ));
-        }
-
-        return $this->cloner->cloneVar($var, Caster::EXCLUDE_VERBOSE);
+                return $a;
+            },
+            FormInterface::class => function (FormInterface $f, array $a) {
+                return array(
+                    Caster::PREFIX_VIRTUAL.'name' => $f->getName(),
+                    Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(get_class($f->getConfig()->getType()->getInnerType())),
+                    Caster::PREFIX_VIRTUAL.'data' => $f->getData(),
+                );
+            },
+        );
     }
 }
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -22,8 +22,8 @@
     },
     "require-dev": {
         "symfony/http-foundation": "~2.8|~3.0|~4.0",
-        "symfony/http-kernel": "~2.8|~3.0|~4.0.0",
-        "symfony/var-dumper": "~3.3|~4.0.0",
+        "symfony/http-kernel": "^3.3.5|~4.0",
+        "symfony/var-dumper": "~3.3|~4.0",
         "symfony/intl": "^2.8.18|^3.2.5|~4.0",
         "symfony/yaml": "~3.3|~4.0",
         "symfony/config": "~2.8|~3.0|~4.0",
@@ -38,6 +38,7 @@
     "conflict": {
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
         "symfony/dependency-injection": "<3.3",
+        "symfony/http-kernel": "<3.3.5",
         "symfony/yaml": "<3.3"
     },
     "suggest": {
